41 files changed, 77421 insertions, 46466 deletions

diff --git a/nova/locale/bg_BG/LC_MESSAGES/nova.po b/nova/locale/bg_BG/LC_MESSAGES/nova.po
index 3db3bc41e..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-17 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) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 55da2b69d..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-17 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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1419,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1441,120 +1462,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1568,7 +1599,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1714,261 +1745,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2138,89 +2164,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2268,6 +2312,7 @@ msgstr ""
 #: 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 ""
 
@@ -2314,21 +2359,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2336,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 ""
 
@@ -2360,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 ""
 
@@ -2373,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 ""
 
@@ -2419,9 +2470,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2550,136 +2601,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2720,6 +2775,7 @@ msgstr ""
 #: 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 ""
 
@@ -2759,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 ""
 
@@ -2880,7 +2937,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2920,32 +2978,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2956,40 +3014,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3023,7 +3088,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3071,7 +3136,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3262,30 +3327,36 @@ 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 "
@@ -3297,7 +3368,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3314,16 +3385,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3347,7 +3418,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3406,12 +3477,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3430,106 +3506,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3540,42 +3629,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3587,7 +3676,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3620,35 +3709,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3669,312 +3807,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3988,244 +4126,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4289,12 +4427,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5065,11 +5223,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5085,15 +5243,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5172,7 +5349,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5194,44 +5371,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5327,47 +5504,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5573,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 ""
@@ -5769,151 +5946,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5934,12 +6112,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6142,11 +6320,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6196,11 +6384,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6625,86 +6808,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6739,35 +6915,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6791,7 +6967,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6809,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 ""
@@ -6860,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"
@@ -7051,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7223,19 +7419,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7245,25 +7441,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7272,7 +7468,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7294,20 +7490,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7326,37 +7522,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7404,85 +7600,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7567,24 +7763,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7594,7 +7790,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7608,22 +7804,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7736,12 +7928,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7994,12 +8186,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8028,23 +8220,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8057,7 +8249,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8409,12 +8601,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8572,7 +8764,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8611,236 +8803,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8848,76 +9040,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8925,50 +9132,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8978,69 +9185,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9059,15 +9271,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9258,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9306,7 +9519,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9314,7 +9527,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9322,7 +9535,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9533,7 +9746,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9679,32 +9892,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9719,34 +9932,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9958,11 +10171,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10067,100 +10280,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10281,106 +10494,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10396,54 +10590,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10703,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 "
@@ -10932,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 ""
 
@@ -11287,32 +11481,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11330,9 +11524,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 bf58bd7ec..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-17 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 "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 6d6e100ba..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-17 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"
@@ -84,162 +84,162 @@ msgstr "Nelze restartovat instanci"
 msgid "Flags path: %s"
 msgstr "Cesta příznaků: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Vyskytla se neočekávaná výjimka."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Nelze dešifrovat text"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Nelze dešifrovat text"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Vytvoření virtuálního rozhraní selhalo"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "Selhalo 5 pokusů o vytvoření virtuálního rozhraní s jedinečnou mac adresou"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Neschváleno."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Pravidla nedovolují, aby bylo %(action)s provedeno."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Kernel nenalezen v obrazu %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Nepřijatelné parametry."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 #, fuzzy
 msgid "Block Device Mapping is Invalid."
 msgstr "block_device_mapping %s"
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Svazek %(volume_id)s není k ničemu připojen"
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Data páru klíčů jsou neplatná"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "Požadavek je neplatný."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Obdržen neplatný vstup"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Neplatný svazek"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "Neplatná metadata"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Neplatný klíč metadata"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Neplatný rozsah portů %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Neplatný protokol IP %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Neplatný typ obsahu %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Neplatný cidr %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -248,16 +248,16 @@ msgstr ""
 "Nelze provést činnost '%(action)s' na agregátu %(aggregate_id)s. Důvod: "
 "%(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -266,119 +266,119 @@ msgstr ""
 "Instance %(instance_uuid)s v %(attr)s %(state)s.  Nelze %(method)s "
 "zatímco je instance v tomto stavu."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s není spuštěna."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s není pozastavena."
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Nelze vložit soubor: %(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Služba je v tuto chvíli nedostupná."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Služba výpočtu je v tuto chvíli nedostupná."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Nelze přesunout instanci (%(instance_id)s) na současného hostitele "
 "(%(host)s)."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Zadaný typ hypervizoru je neplatný."
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Instance vyžaduje novější verzi hypervizoru, než byla poskytnuta."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "Zadaná cesta disku (%(path)s) již existuje, očekává se, že nebude."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Nepřijatelné informace o procesoru"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s není platná IP adresa v4/6."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -387,7 +387,7 @@ msgstr ""
 "Značka VLAN není vhodná pro skupinu portů %(bridge)s. Očekávaná značka "
 "VLAN je %(tag)s, ale značka připojená ke skupině portů je %(pgroup)s."
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -398,86 +398,86 @@ msgstr ""
 " fyzickým adaptérem. Očekávaný vSwitch je %(expected)s, ale spojený je "
 "%(actual)s."
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formát disku %(disk_format)s není přijatelný"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Obraz %(image_id)s je nepřijatelný: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Instance %(instance_id)s je nepřijatelná: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Id Ec2 %(ec2_id)s je nepřijatelné."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Neplatný cidr %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance - %s není přítomno"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Zdroj nemohl být nalezen."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "Žádná pevná IP není spojena s %(id)s."
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Źádný disk ve %(location)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Nelze najít obslužnou rutinu pro svazek %(driver_type)s."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Neplatný href %(image_href)s obrazu."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -485,65 +485,65 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "Nelze najít SR pro čtení/zápis VDI."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s je vyžadováno pro vytvoření sítě."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Síť nemohla být pro most %(bridge)s nalezena."
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Síť nemohla být pro uuid %(uuid)s nalezena."
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Síť nemohla být pro cidr %(cidr)s nalezena."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Síť nemohla být pro instance %(instance_id)s nalezena."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Źádné sítě nejsou určeny."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -552,238 +552,234 @@ msgstr ""
 "Buď síť uuid %(network_uuid)s není přítomna nebo je přidělena projektu "
 "%(project_id)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "Nelze najít odkazy datového úložiště, který VM používá."
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Síť nemohla být pro instance %(instance_id)s nalezena."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "Síť nemohla být pro instance %(instance_id)s nalezena."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "Žádná pevná IP není spojena s %(id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Pevná ip není pro adresu %(address)s nalezena."
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Instance %(instance_id)s má nula pevných ip."
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "Síťový hostitel %(host)s má nula pevných ip v síti %(network_id)s."
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Instance %(instance_id)s nemá pevnou ip '%(ip)s'."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "Pevná IP adresa (%(address)s) v síti (%(network_uuid)s) neexistuje."
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "Pevná IP adresa (%(address)s) je již používána."
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Pevná IP adresa (%(address)s) je neplatná."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "Je dostupno nula pevných ip."
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "Bylo nalezeno nula pevných ip."
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Plovoucí ip není nalezena pro id %(id)s."
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "Záznam DNS %(name)s již v doméně %(domain)s existuje."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Plovoucí ip nenalezeno pro adresu %(address)s."
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Plovoucí ip nenalezeno pro hostitele %(host)s."
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "Plovoucí ip nenalezeno pro adresu %(address)s."
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "Existuje nula plovoucích ip."
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Rozhraní %(interface)s nenalezeno."
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "Dvojice klíčů %(name)s nenalezena pro uživatele %(user_id)s"
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr "Certifikát %(certificate_id)s nenalezen."
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Hostitel %(host)s nemohl být nalezen."
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Hostitel výpočtu %(host)s nemohl být nalezen."
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Nelze najít binární soubor %(binary)s v hostiteli %(host)s."
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Kvóta nemohla být nalezena."
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Uživatel %(user_id)s nemohl být nalezen."
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Rozšířený zdroj: %s"
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Bezpečnostní skupina %(security_group_id)s není nalezena."
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Bezpečnostní skupina %(security_group_id)s není nalezena v projektu "
 "%(project_id)s."
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Bezpečnostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/exception.py:747
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -792,7 +788,7 @@ msgstr ""
 "Bezpečnostní skupina %(security_group_id)s je již přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:752
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -801,37 +797,37 @@ msgstr ""
 "Bezpečnostní skupina %(security_group_id)s není přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:757
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "Bezpečnostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Přesun %(migration_id)s nemohl být nalezen."
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Přesun nenalezen v instanci %(instance_id)s se stavem %(status)s."
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Zásoba konzole %(pool_id)s nemohla být nalezena."
 
-#: nova/exception.py:784
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -840,17 +836,17 @@ msgstr ""
 "Zásoba konzole typu %(console_type)s pro výpočetního hostitele "
 "%(compute_host)s v hostitele proxy %(host)s nemohla být nalezena."
 
-#: nova/exception.py:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Konzole %(console_id)s nemohla být nalezena."
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Konzole pro instanci %(instance_id)s nemohla být nalezena."
 
-#: nova/exception.py:798
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
@@ -859,88 +855,93 @@ msgstr ""
 "Konzole pro instanci %(instance_id)s v zásobě %(pool_id)s nemohla být "
 "nalezena."
 
-#: nova/exception.py:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Neplatná konzole typu %(console_type)s "
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Instance typu %(instance_type_id)s nemohla být nalezena."
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Instance typu s názvem %(instance_type_name)s nemohla být nalezena."
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Konfigurace %(flavor_id)s nemohla být nalezena."
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "skupina svazku %s neexistuje"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 #, fuzzy
 msgid "Timeout waiting for response from cell"
 msgstr "Při čekání na odpověď RPC vypršel čas: %s"
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Filtr hostitelů plánovače %(filter_name)s nemohl být nalezen."
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Instance %(instance_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "Instance %(instance_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -949,455 +950,475 @@ msgstr ""
 "Instance typu %(instance_type_id)s nemá žádné dodatečné specifikace s "
 "klíčem %(extra_specs_key)s."
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Soubor %(file_path)s nemohl být nalezen."
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr "Nalezeno nula souborů."
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "Nenalezen virtuální přepínač sdružený se síťovým adaptérem %(adapter)s."
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Síťový adaptér %(adapter)s nemohl být nalezen."
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "Činnost není povolena."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr "Střídání není povoleno pro snímky"
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr "Parametr rotation je vyžadován pro backup image_type"
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "Dvojice klíčů %(key_name)s již existuje."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s již existuje."
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "Chyba přesunu"
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "Chyba přesunu"
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Nelze načíst aplikaci vložení '%(name)s' z %(path)s"
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "Při změně velikosti ji musí instance změnit také!"
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr "Typ paměti instance je pro požadovaný obraz příliš malý."
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr "Typ disku instance je pro požadovaný obraz příliš malý."
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Pro spuštění %(uuid)s je v uzlu výpočtu nedostatek volné paměti."
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Nelze získat metriky šířky pásma/procesoru/disku pro tohoto hostitele."
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Kvóta překročena"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr "Překročen limit osobnostního souboru"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr "Cesta osobnostního souboru je příliš dlouhá"
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr "Obsah osobnostního souboru je příliš dlouhý"
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr "Agregát %(aggregate_id)s nemá hostitele %(host)s."
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Agregát %(aggregate_id)s nemohl být nalezen."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Agregát %(aggregate_name)s již existuje."
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "Agregát %(aggregate_id)s nemá hostitele %(host)s."
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "Agregát %(aggregate_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "Agregát %(aggregate_id)s již má hostitele %(host)s."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Zjišťěna existující vlan s id %(vlan)"
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Konzole pro instanci %(instance_id)s nemohla být nalezena."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Plovoucí ip nenalezeno pro hostitele %(host)s."
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s nenalezena"
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: 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:1140
+#: 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:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: 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:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: 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:1177
+#: 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:1181
+#: 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:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: 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:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Očekáván objekt typu: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1412,15 +1433,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Oznamování schopností plánovačům ..."
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Nelze získat metadata pro ip: %s"
@@ -1443,17 +1464,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1486,120 +1507,130 @@ 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:436
-#, fuzzy, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr "Neznámý základní soubor: %s"
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Očekáván objekt typu: %s"
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/utils.py:724
+#: 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:778 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:900 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:1060
+#: 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:1064
+#: 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:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, fuzzy, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr "%(name)s spuštěno v %(host)s:%(port)s"
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Nelze najít adresu %r"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Nelze najít adresu %r"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Nelze najít adresu %r"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr "Zastavování serveru WSGI."
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr "Server WSGI byl zastaven."
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "Musíte zavést __call__"
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, fuzzy, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr "Nelze načíst aplikaci vložení '%(name)s' z %(path)s"
@@ -1613,7 +1644,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1764,274 +1795,269 @@ msgstr ""
 "Nepodporovaný požadavek API: ovladač = %(controller)s, činnost = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Vytvořit snímek svazku %s"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Nelze dešifrovat soukromý klíč: %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Vytvořit dvojici klíčů %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "Imprtovat klíč %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Smazat dvojici klíčů %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Není dostatek parametrů k sestavení platného pravidla."
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Neplatný protokol IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Pro zadané parametry není žádné pravidlo."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Toto pravidlo již existuje ve skupině %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Vytvořit svazek o %s GB"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
 
-#: nova/api/ec2/cloud.py:898
+#: nova/api/ec2/cloud.py:895
 #, fuzzy
 msgid "Attach Failed."
 msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "vlastnost není podporována: %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "svz = %s\n"
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Přidělit adresu"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "Žádné další plovoucí ip nejsou dostupné."
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Uvolnit adresu %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1261
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Přidělit adresu %(public_ip)s k instanci %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, fuzzy, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr "existuje mnoho pevných ip, použita je první: %s"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1285
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Oddělit adresu %s"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Obraz musí být dostupný"
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Restratovat instanci %r"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "Instance budou zastaveny"
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "Instance budou spuštěny"
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Zrušení registrace obrazu %s"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Obraz %(image_location)s registrován s id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "uživatel nebo skupina nebyly zadány"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "podporována je pouze skupina \"all\""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type musí být add nebo remove"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Aktualizace publicity obrazu %s"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Nelze zastavit instanci za %d sek"
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Získávání seznamu instancí"
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance - %s není přítomno"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Získávání seznamu instancí"
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Neplatná data jednotky"
@@ -2205,89 +2231,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr "Neplatná metadata"
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Nelze '%(action)s' zatímco instance je %(attr)s %(state)s"
 
 #: 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
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "Instance je v neplatném stavu pro '%(action)s'"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Odmítnutí žádosti o snímek, snímky jsou nyní zakázány"
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Snímky instance nejsou v současnosti povoleny."
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Načteno rozšíření: %s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr "Název roz: %s"
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Přezdívká roz: %s"
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr "Popis roz: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Jmenný prostor roz: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Roz aktualizováno: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "Výjimka při načítání rozšíření: %s"
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Načítání rozšíření %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "Volání továrny rozšíření %s"
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Nelze načít rozšížení %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Nelze načíst rozšíření %(classpath)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Nelze načíst rozšíření %(ext_name)s: %(exc)s"
 
+#: 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 "JSON nelze porozumět"
@@ -2335,6 +2379,7 @@ msgstr "Žádná taková činnost: %s"
 #: 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 "Poškozené tělo požadavku"
 
@@ -2383,21 +2428,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr "podtřídy musí zavádět construct()!"
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2405,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"
 
@@ -2429,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 ""
 
@@ -2442,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 "
@@ -2451,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í."
 
@@ -2491,9 +2542,9 @@ msgstr "Hostitel %(host)s nemohl být nalezen."
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 "Instance nemohla být nalezena"
 
@@ -2626,143 +2677,147 @@ 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:923
+msgid "Invalid config_drive provided."
+msgstr ""
+
 #: nova/api/openstack/compute/servers.py:999
-#: nova/api/openstack/compute/plugins/v3/servers.py:1081
+#: 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:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: 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:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1049
-#: nova/api/openstack/compute/plugins/v3/servers.py:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1069
-#: nova/api/openstack/compute/plugins/v3/servers.py:1151
+#: 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:1091
-#: nova/api/openstack/compute/plugins/v3/servers.py:1173
+#: 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:1094
-#: nova/api/openstack/compute/plugins/v3/servers.py:1176
+#: 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:1100
-#: nova/api/openstack/compute/plugins/v3/servers.py:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: 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:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "Chybí vlastnost imageRef"
 
 #: nova/api/openstack/compute/servers.py:1138
-#: nova/api/openstack/compute/plugins/v3/servers.py:1220
+#: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr "Zadáno neplatné imageRef."
 
 #: nova/api/openstack/compute/servers.py:1165
-#: nova/api/openstack/compute/plugins/v3/servers.py:1253
+#: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "Chybí vlastnost flavorRef"
 
 #: nova/api/openstack/compute/servers.py:1178
-#: nova/api/openstack/compute/plugins/v3/servers.py:1266
+#: 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:1182
 #: nova/api/openstack/compute/servers.py:1391
-#: nova/api/openstack/compute/plugins/v3/servers.py:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1188
-#: nova/api/openstack/compute/plugins/v3/servers.py:1276
+#: 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:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1210
-#: nova/api/openstack/compute/plugins/v3/servers.py:1298
+#: 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:1213
-#: nova/api/openstack/compute/plugins/v3/servers.py:1301
+#: 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:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
+#: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr "Neplatné tělo požadavku"
 
 #: nova/api/openstack/compute/servers.py:1237
-#: nova/api/openstack/compute/plugins/v3/servers.py:1325
+#: 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:1298
-#: nova/api/openstack/compute/plugins/v3/servers.py:1386
+#: 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:1332
-#: nova/api/openstack/compute/plugins/v3/servers.py:1420
+#: 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:1417
-#: nova/api/openstack/compute/plugins/v3/servers.py:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
@@ -2803,6 +2858,7 @@ msgstr "Compute.api::reset_sítě %s"
 #: 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 "Server nenalezen"
 
@@ -2843,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"
 
@@ -2970,7 +3027,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 "Může být získán pouze kořenový certifikát."
 
@@ -3014,34 +3072,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp není spuštěno"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Neplatný snímek"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Bezpečnostní skupina %s již existuje"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, fuzzy, python-format
 msgid "Coverage doesn't have %s action"
 msgstr "Síť nemá činnost %s"
@@ -3052,42 +3110,49 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s musí být buď 'MANUAL' nebo 'AUTO'."
 
 #: 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
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host a block_migration musí být zadány."
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Chyba v přesunu %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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"
@@ -3123,7 +3188,7 @@ msgstr "Plovoucí ip %(address)s není přidružena."
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr "Chybí parametr dict"
 
@@ -3176,7 +3241,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3374,30 +3439,36 @@ msgid "Create networks failed"
 msgstr "Vytvoření selhalo"
 
 #: 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 "
@@ -3409,7 +3480,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr "Poškozená vlasnost scheduler_hints"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Není dostatek parametrů k sestavení platného pravidla."
 
@@ -3428,16 +3499,16 @@ msgstr "Zobrazování sítě s id %s"
 msgid "security group default rule not found"
 msgstr "Bezpečnostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Špatná předpona pro to_global_ipv6: %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "Není zadána bezpečnostní skupina"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "Název bezpečnostní skupiny nemůže být prázdné"
 
@@ -3463,7 +3534,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 #, fuzzy
 msgid "Unknown service"
 msgstr "neznámá chyby připojení hosta"
@@ -3523,12 +3594,17 @@ msgstr "Načteno rozšíření: %s"
 msgid "Ext version: %i"
 msgstr "Popis roz: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Uvolnit adresu %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Uvolnit adresu %s"
@@ -3547,107 +3623,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: nova/api/openstack/compute/plugins/v3/servers.py:1031
 #, fuzzy, python-format
 msgid "Running _create_extension_point for %s"
 msgstr "Volání továrny rozšíření %s"
 
-#: nova/api/openstack/compute/views/servers.py:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: 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:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3658,42 +3747,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3705,7 +3794,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3738,35 +3827,84 @@ msgstr "Spouštění VPN pro %s"
 msgid "Failed to load %s"
 msgstr "Nelze vytvořit svazek"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "prvek není podřazený"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3789,326 +3927,326 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "obdrženo: %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "Reset sítě"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "počáteční adresa"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Bylo nalezeno nula pevných ip."
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "K instanci nejsou přidruženy žádné pevné ip"
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "počáteční adresa"
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "projekt"
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "Síť nenalezena"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s je vyžadováno pro vytvoření sítě."
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "zastavit instanci %r"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Neočekávaná chyba: %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 #, fuzzy
 msgid "PROJECT"
 msgstr "projekt"
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 #, fuzzy
 msgid "Must supply valid parameters to create instance_type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance - %s není přítomno"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 #, fuzzy
 msgid "Unknown error"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "Tabulka |%s| není vytvořena!"
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 #, fuzzy
 msgid "Valid instance type name is required"
 msgstr "%s je platný název instance"
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "typ je = %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4122,26 +4260,26 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "Překročena kvóta instancí. Nemůžete spustit další instance tohoto typu."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Překročena kvóta instancí. Můžete spustit pouze %s dalších instancí "
 "tohoto typu."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -4150,99 +4288,99 @@ msgstr ""
 "Překročena kvóta pro %(pid)s, pokus o nastavení %(num_metadata)s "
 "vlastností metadat"
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 #, fuzzy
 msgid "Metadata property key greater than 255 characters"
 msgstr "Bezpečnostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 #, fuzzy
 msgid "Metadata property value greater than 255 characters"
 msgstr "Bezpečnostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: 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:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: 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:1268
+#: 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:1311
+#: 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:1335
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr "Hledání podle: %s"
 
-#: nova/compute/api.py:1710
+#: 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:2046
+#: 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:2055
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4251,63 +4389,63 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2103
+#: 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:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: 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:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: 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:2903
+#: 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:2911
+#: nova/compute/api.py:2923
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4316,70 +4454,70 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
 "255 znaků."
 
-#: nova/compute/api.py:2917
+#: 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:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Vytvořit bezpečnostní skupinu %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Bezpečnostní skupina %s již existuje"
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: 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:3029
+#: 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:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: 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:3133
+#: 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:3136
+#: 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:3145
+#: 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:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
@@ -4444,13 +4582,13 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than or equal to 0"
-msgstr "Vlastnost createBackup 'rotation' musí být celé číslo"
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
 
 #: nova/compute/flavors.py:119
 #, fuzzy
@@ -4471,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4493,241 +4631,261 @@ msgstr ""
 "Nelze přesunout instanci (%(instance_id)s) na současného hostitele "
 "(%(host)s)."
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Nelze restartovat instanci"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Restartování instance po restartu nova-compute."
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Ovladač hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Ovladač hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Neočekávaný kód stavu"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr "Kontrola stavu"
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Nastavování bdm %s"
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: 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:1004
+#: nova/compute/manager.py:1013
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr "Spouštění instance..."
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/compute/manager.py:1175
-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:1177
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Informace o síti instance: |%s|"
 
 #: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s nstance"
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "ukončování bdm %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Znovu sestavování instance %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: 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:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: 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:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Restartování instance %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1876
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4736,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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: znovu zavedena"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1961
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4764,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:1973
+#: 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:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Střídání %d záloh"
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Mazání obrazu %s"
 
-#: nova/compute/manager.py:2014
+#: 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:2021
+#: nova/compute/manager.py:2070
 #, fuzzy
 msgid "Root password set"
 msgstr "Instance %s: Nastavení hesla root"
 
-#: nova/compute/manager.py:2028
+#: 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:2043
+#: 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:2050
+#: nova/compute/manager.py:2099
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Chyba při nastavování hesla správce"
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: rušení záchrany"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: 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:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance nemá svazek."
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "cíl stejný jako zdroj!"
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 #, fuzzy
 msgid "Pausing"
 msgstr "Aktualizování!"
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: získávání diagnostik"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "Reset sítě"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "instance %s: vkládání informací o síti"
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info vkládá: |%s|"
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:3003
+#: 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:3054
+#: 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:3064
+#: 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:3080
+#: 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:3111
+#: 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:3122
+#: 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:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: 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:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: 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:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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."
@@ -4996,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:3476
+#: nova/compute/manager.py:3525
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Spuštěna operace po migraci"
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -5019,64 +5177,64 @@ msgstr ""
 "Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
 "%(confirm_window)d vteřin"
 
-#: nova/compute/manager.py:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: 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:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "Aktualizace stavu hostitele"
 
-#: nova/compute/manager.py:3936
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5085,86 +5243,86 @@ msgstr ""
 "Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
 "hypervizoru."
 
-#: nova/compute/manager.py:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance není zapnuta"
 
-#: nova/compute/manager.py:4084
+#: 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:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr "Znovu získávání smazané instance"
 
-#: nova/compute/manager.py:4124
+#: 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:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: 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"
@@ -5266,11 +5424,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr "Nezadán žádný počítačový hostitel"
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "Nelze najít hostitele pro instanci %s"
@@ -5286,16 +5444,37 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:322
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, fuzzy, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+"Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek paměti "
+"(hostitel:%(avail)s <= instance:%(mem_inst)s)"
+
+#: 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 "Přidávání konzole"
@@ -5377,7 +5556,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Nelze restartovat instanci"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5400,44 +5579,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Nerozpoznaná hodnota read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:662
+#: 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:883
+#: 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:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: 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:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: zachráněna"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5535,47 +5714,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr "Stahování obrazu %s ze serveru obrazu glance"
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "Nelze stáhnout %(image_location)s do %(image_path)s"
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "Nelze dešifrovat %(image_location)s do %(image_path)s"
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "Nelze rozbalit %(image_location)s do %(image_path)s"
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "Nelze nahrát %(image_location)s do %(image_path)s"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "Nelze dešifrovat soukromý klíč: %s"
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Nelze dešifrovat vektor zavedení: %s"
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Nelze dešifrovat soubor obrazu %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr "Nebezpečné názvy souboru v obrazu"
 
@@ -5787,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"
@@ -5996,158 +6175,158 @@ 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"
 
-#: nova/network/quantumv2/__init__.py:67
-#, fuzzy
-msgid "quantum authentication failed"
-msgstr "Chyba ověření"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, fuzzy, python-format
 msgid "allocate_for_instance() for %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "Hostitel nenalezen"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, fuzzy, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr "oddělení sítě pro instanci |%s|"
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr "Nelze smazat svazek v db"
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr "Nelze smazat svazek v db"
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, fuzzy, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, fuzzy, python-format
 msgid "validate_networks() for %s"
 msgstr "Špatný formát sítě"
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Plovoucí ip není nalezena pro id %(id)s."
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Zachycena chyba: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Zachycena chyba: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Bezpečnostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Bezpečnostní skupina %(security_group_id)s není nalezena v projektu "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6171,12 +6350,12 @@ msgstr "Chyba při nastavování hesla správce"
 msgid "Invalid version string"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6382,11 +6561,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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
+#, fuzzy, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr "Neznámý základní soubor: %s"
+
 #: nova/openstack/common/db/sqlalchemy/session.py:462
 msgid "DB exception wrapped."
 msgstr "Vyjímka DB zabalena."
@@ -6436,11 +6625,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, fuzzy, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr "Nelze načíst rozšíření %(classpath)s: %(exc)s"
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6880,88 +7064,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "Běží odpovídající služba?"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "Nelze najít další výpočet"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, fuzzy, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-"Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek paměti "
-"(hostitel:%(avail)s <= instance:%(mem_inst)s)"
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "Pokus o sestavení %(num_instances)d instancí"
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "Požadavek: %s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Filtrováno %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "Filtrováno %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6998,36 +7173,36 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr "Obdržena aktualizace služby %(service_name)s od %(host)s."
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, fuzzy, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr "Obdržena aktualizace služby %(service_name)s od %(host)s."
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "Žádná služba pro ID výpočtu %s"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
-#, 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'"
 msgstr "Nelze vyhodnotit soubor voleb plánovače %(filename)s: '%(e)s'"
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
+#, python-format
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
+
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "Nelze dekódovat volby plánovače: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
+msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
@@ -7050,7 +7225,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7068,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 ""
@@ -7119,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"
@@ -7311,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 ""
@@ -7319,53 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "Spouštění instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "Po ukončení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: nova/tests/compute/test_compute.py:4135
+#: 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:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7491,19 +7686,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Vytváření souborů v %s pro simulaci agenta hosta"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
@@ -7513,25 +7708,25 @@ msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "Zaznamování ovladače svazku: %s"
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Nelze načíst ovladač virtualizace: %s"
@@ -7541,7 +7736,7 @@ msgstr "Nelze načíst ovladač virtualizace: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "Pokus o odfiltrování instance, která není filtrována"
 
@@ -7564,20 +7759,20 @@ msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 msgid "Adding provider rule: %s"
 msgstr "Přidávání pravidla poskytovatele: %s"
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr "zpracování 'qemu-img info' selhalo."
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr "fmt=%(fmt)s zálohováno: %(backing_file)s"
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Převedeno na prosté, ale formát je nyní %s"
@@ -7596,37 +7791,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Získávání seznamu instancí"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7677,85 +7872,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Přidělení plovoucí IP pro |%s|"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Stahování obrazu %s ze serveru obrazu glance"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: nova/virt/baremetal/pxe.py:480
 #, fuzzy, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr "Při čekání na odpověď RPC vypršel časový limit."
 
-#: nova/virt/baremetal/tilera.py:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Nelze najít hostitele pro instanci %s"
@@ -7843,24 +8038,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, fuzzy, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr "Nelze zjistit název zavaděče iscsi"
@@ -7870,7 +8065,7 @@ msgstr "Nelze zjistit název zavaděče iscsi"
 msgid "No fixed PXE IP is associated to %s"
 msgstr "K instanci nejsou přidruženy žádné pevné ip"
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7884,23 +8079,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "Žádné další plovoucí ip nejsou dostupné."
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "nenalezeny žádné oddíly"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Vytvoření virtuálního rozhraní selhalo"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "nenalezeny žádné oddíly"
@@ -8013,12 +8203,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8275,12 +8465,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Nelze aktualizovat agenta: %(resp)r"
@@ -8309,23 +8499,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Získat výstup konzole pro instanci %s"
@@ -8339,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:3943
+#: 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"
@@ -8705,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:1924
+#: 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:1931
+#: 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'"
@@ -8876,7 +9066,7 @@ msgstr "Připojeni svazku: %(connection_info)s, %(instance_name)s, %(mountpoint)
 msgid "Detaching physical disk from instance: %s"
 msgstr "Vytváření snímku instance VM %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr "Nelze zjistit název zavaděče iscsi"
 
@@ -8915,248 +9105,248 @@ msgstr "Neůze najít vbd pro vdi %s"
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "skupina svazku %s neexistuje"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Připojení k libvirt poškozeno"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během ničení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr "Instance úspěšně zničena."
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Instance budou zastaveny"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během rušení určení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během rušení určení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
-msgstr "Mazání souborů instance %(target)s"
+msgid "Deleting instance files %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Nelze naplánovat_%(method)s: %(ex)s"
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "Nelze zjistit název zavaděče iscsi"
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "Nelze zjistit název zavaděče iscsi"
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Źádné sítě nejsou určeny."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Źádné sítě nejsou určeny."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr "Instance je spuštěna"
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: 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:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9164,19 +9354,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9185,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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2708
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9220,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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: 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:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9246,21 +9451,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9269,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:3077
+#: 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:3085
+#: 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:3130
+#: nova/virt/libvirt/driver.py:3174
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9287,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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9296,7 +9501,7 @@ msgstr ""
 "Spuštěná instance má info o CPU:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9311,7 +9516,7 @@ msgstr ""
 "\n"
 "Prohlédněte si %(u)s"
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9320,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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Přesun před spuštěním selhal na %(dest)s"
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: nova/virt/libvirt/driver.py:3568
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9346,45 +9551,50 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
-msgstr "přeskakování %(path)s protože vypadá jako svazek"
+msgid "skipping %s since it looks like volume"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: 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:3721
+#: nova/virt/libvirt/driver.py:3788
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Instance %s úspěšně běží."
 
-#: nova/virt/libvirt/driver.py:3727
+#: 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:3792
+#: 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:3915
-#, fuzzy, python-format
-msgid "Checking instance files accessability%(instance_path)s"
-msgstr "Mazání souborů instance %(target)s"
+#: nova/virt/libvirt/driver.py:3982
+#, python-format
+msgid "Checking instance files accessability %s"
+msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
 msgid ""
@@ -9404,15 +9614,15 @@ msgstr "Zajišťování statických filtrů"
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr "Nwfilter (%(instance_filter_name)s) nenalezen."
+msgid "The nwfilter(%s) is not found."
+msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "Nwfilter (%(instance_filter_name)s) pro %(name)s nenalezen."
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Nastavení základního filtrování"
 
@@ -9611,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: 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:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "Zajišťování mostu %s"
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9660,7 +9871,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9668,7 +9879,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9676,7 +9887,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9898,7 +10109,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -10048,32 +10259,32 @@ msgstr ""
 "Pro useconnection_type=vmwareapi musíte zadat "
 "vmwareapi_host_ip,vmwareapi_host_username a vmwareapi_host_password"
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "značka [%s] nenalezena"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "In vmwareapi:_create_session, obdržena tato výjimka: %s"
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "In vmwareapi:_call_method, obdržena tato výjimka: %s"
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "Úkol [%(task_name)s] %(task_ref)s stav: úspěch"
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "Úkol [%(task_name)s] %(task_ref)s stav: chyba %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "In vmwareapi:_poll_task, Obdržena tato chyba %s"
@@ -10088,34 +10299,34 @@ msgstr "Při volání RetrieveProperties se událo %s chyb"
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, fuzzy, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "Vlastnost %(attr)s nenastavena pro spravovaný objekt %(objName)s"
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr "Není registrováno žádné VM"
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "Virtuální stroj s ref %s neexistuje"
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "Odhlašování sezení, které je neplatné, nebo už odhlášené: %s"
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr "Sezení je chybné"
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "Sezení je neplatné"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " Žádné virtuální stroje nebyly zatím registrovány"
@@ -10362,12 +10573,12 @@ msgstr "Provádění tvrdho restártu VM %s"
 msgid "Did hard reboot of VM"
 msgstr "Proveden tvrdý restart VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Registrace VM %s zrušena"
@@ -10490,109 +10701,109 @@ msgstr "Vypínání VM %s"
 msgid "Powered on the VM"
 msgstr "VM %s vypnuto"
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Mazání svazku s ID: %s "
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instance - %s není přítomno"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr "Ve vmwareapi:vmops:destroy, obdržena výjimka při rušení registrace VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Mazání svazku s ID: %s "
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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 ""
 "Nalezeno %(instance_count)d zaseknutých restartování starších než "
 "%(timeout)d vteřin"
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "Automatický tvrdý restart %d"
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics není zavedeno pro vmwareapi"
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 #, fuzzy
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr "Znovu nastavování instance VM %s pro připojení obrazu disku"
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 #, fuzzy
 msgid "Reconfigured VM instance to set the machine id"
 msgstr "Instance VM %s znovu nastavena pro připojení obrazu disku"
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, fuzzy, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 "Znovu nastavování instance VM %(name)s pro úpravu id stroje s ip - "
 "%(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, fuzzy, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 "Instance VM %(name)s znovu nastavena pro úpravu id stroje s ip - "
 "%(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Vytváření adresáře s cestou %s"
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Vytvořen adresář s cestou %s"
@@ -10715,14 +10926,14 @@ msgstr "Nelze najít svazek v db"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Bod připojení %(mountpoint)s odpojen od instance %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 "ČASOVÝ LIMIT: Vypršel čas volání %(method)s. VM id=%(instance_uuid)s; "
 "arg=%(args)r"
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10731,74 +10942,55 @@ msgstr ""
 "NEZAVEDENO: Volání %(method)s není agentem podporováno. VM "
 "id=%(instance_uuid)s; arg=%(args)r"
 
-#: nova/virt/xenapi/agent.py:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "Volání %(method)s vrátilo chybu: %(e)s."
 
-#: nova/virt/xenapi/agent.py:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr "Dotaz na verzi agenta"
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Aktualizace agenta na %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "Nastavování správcovského hesla"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr "Reset sítě"
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
@@ -10806,7 +10998,7 @@ msgstr ""
 "Nástroje XenServer instalované v tomto obrazu jsou schopné vložit sítě. "
 "Síťové soubory nebudou změněny"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
@@ -10814,15 +11006,15 @@ msgstr ""
 "Nástroje XenServer jsou v tomto obrazu přítomny, ale nejsou schopny "
 "vložit síť"
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr "Nástroje XenServer nejsou v tomto obrazu nainstalovány"
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Chyba OpenSSL: %s"
@@ -10841,54 +11033,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Nelze dešifrovat soukromý klíč: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr "Spuštění hostitele na XenServer není podporováno."
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "Nelze se přihlásit do XenAPI (je disk Dom0 plný?)"
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obdržena výjimka: %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "Oznamování NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake nemá zavedeno %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11155,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 "
@@ -11186,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 "
@@ -11252,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: "
@@ -11304,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 "
@@ -11328,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 "
@@ -11395,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 "
@@ -11413,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 ""
 
@@ -11776,32 +11968,32 @@ msgstr "Neznámý základní soubor: %s"
 msgid "Error in handshake: %s"
 msgstr "Chyba při zahájení komunikace: %s"
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr "Neplatný požadavek: %s"
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr "Požadavek: %s"
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr "Proveden požadavek s chybějící známkou: %s"
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr "Proveden požadavek s neplatnou známkou: %s"
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr "Neočekávaná chyba: %s"
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "Spouštění uzlu nova-xvpvncproxy (verze %s)"
@@ -11821,9 +12013,18 @@ msgstr "stav musí být dostupný"
 msgid "status must be 'available'"
 msgstr "stav musí být dostupný"
 
-#~ msgid "Cannot reboot instance: %s"
+#~ msgid "Cannot disassociate auto assigined floating ip"
 #~ msgstr ""
 
-#~ msgid "No Volume Connector found."
+#~ 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 42b928780..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-17 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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1419,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1441,120 +1462,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1568,7 +1599,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1714,261 +1745,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2138,89 +2164,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2268,6 +2312,7 @@ msgstr ""
 #: 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 ""
 
@@ -2314,21 +2359,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2336,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 ""
 
@@ -2360,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 ""
 
@@ -2373,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 ""
 
@@ -2419,9 +2470,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2550,136 +2601,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2720,6 +2775,7 @@ msgstr ""
 #: 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 ""
 
@@ -2759,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 ""
 
@@ -2880,7 +2937,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2920,32 +2978,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2956,40 +3014,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3023,7 +3088,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3071,7 +3136,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3262,30 +3327,36 @@ 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 "
@@ -3297,7 +3368,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3314,16 +3385,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3347,7 +3418,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3406,12 +3477,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3430,106 +3506,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3540,42 +3629,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3587,7 +3676,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3620,35 +3709,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3669,312 +3807,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3988,244 +4126,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4289,12 +4427,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5065,11 +5223,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5085,15 +5243,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5172,7 +5349,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5194,44 +5371,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5327,47 +5504,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5573,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 ""
@@ -5769,151 +5946,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5934,12 +6112,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6142,11 +6320,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6196,11 +6384,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6625,86 +6808,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6739,35 +6915,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6791,7 +6967,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6809,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 ""
@@ -6860,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"
@@ -7051,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7223,19 +7419,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7245,25 +7441,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7272,7 +7468,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7294,20 +7490,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7326,37 +7522,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7404,85 +7600,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7567,24 +7763,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7594,7 +7790,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7608,22 +7804,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7736,12 +7928,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7994,12 +8186,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8028,23 +8220,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8057,7 +8249,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8409,12 +8601,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8572,7 +8764,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8611,237 +8803,237 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 8a667ae45..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-17 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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,86 +378,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "Instanz %s: Rettung"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: 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:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,262 +1746,257 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "Instanz %s: Rettung"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2140,89 +2166,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2270,6 +2314,7 @@ msgstr ""
 #: 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 ""
 
@@ -2316,21 +2361,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2338,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 ""
 
@@ -2362,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 ""
 
@@ -2375,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 ""
 
@@ -2421,9 +2472,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2552,137 +2603,141 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Instanz %s: Rettung"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2723,6 +2778,7 @@ msgstr ""
 #: 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 ""
 
@@ -2762,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 ""
 
@@ -2884,7 +2941,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2925,32 +2983,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2961,40 +3019,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3029,7 +3094,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3077,7 +3142,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3268,30 +3333,36 @@ 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 "
@@ -3303,7 +3374,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3320,16 +3391,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3353,7 +3424,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3412,12 +3483,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3436,107 +3512,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: 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:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3547,42 +3636,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3594,7 +3683,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3627,35 +3716,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3676,313 +3814,313 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "Instanz %s: Rettung"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3996,245 +4134,245 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: 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:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4298,12 +4436,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4324,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Volume %s: erstelle Export"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: 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:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: 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:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: 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:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: 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:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,11 +5239,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5101,15 +5259,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5188,7 +5365,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5210,44 +5387,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5343,47 +5520,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5589,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 ""
@@ -5785,152 +5962,153 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "Instanz %s pausiert"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5951,12 +6129,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6160,11 +6338,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6214,11 +6402,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6643,86 +6826,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6757,35 +6933,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6809,7 +6985,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6827,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 ""
@@ -6878,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"
@@ -7069,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7241,19 +7437,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7263,25 +7459,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7290,7 +7486,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7312,20 +7508,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7344,37 +7540,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7427,85 +7623,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7590,24 +7786,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7617,7 +7813,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7631,22 +7827,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "Instanz %s pausiert"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7759,12 +7951,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8017,12 +8209,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Nicht möglich volume %s zufinden"
@@ -8051,23 +8243,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8080,7 +8272,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8432,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:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8597,7 +8789,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8636,237 +8828,237 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8874,76 +9066,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8951,50 +9158,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9004,69 +9211,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9085,15 +9297,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9284,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9332,7 +9545,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9340,7 +9553,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9348,7 +9561,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9559,7 +9772,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9705,32 +9918,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9745,34 +9958,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9984,11 +10197,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10093,101 +10306,101 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "Instanz %s: Rettung"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10310,106 +10523,87 @@ msgstr "Nicht möglich volume %s zufinden"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10425,54 +10619,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10732,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 "
@@ -10961,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 ""
 
@@ -11318,32 +11512,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11361,9 +11555,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 8cb488dbe..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-17 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"
@@ -80,301 +80,301 @@ msgstr "Going to start terminating instances"
 msgid "Flags path: %s"
 msgstr "Flags path: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "instance %s: booted"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "no method for message: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Invalid signature for user %s"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -382,86 +382,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: rescued"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -469,897 +469,918 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "setting network host"
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "instance %(instance_name)s: deleting instance files %(target)s"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "setting network host"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "volume group %s doesn't exist"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: 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:1140
+#: 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:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1213
+#: 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:1218
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1374,15 +1395,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Failed to get metadata for ip: %s"
@@ -1405,17 +1426,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1448,120 +1469,130 @@ 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:436
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Unable to find SR from VBD %s"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Unable to find SR from VBD %s"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Unable to find SR from VBD %s"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "You must implement __call__"
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1575,7 +1606,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1724,265 +1755,260 @@ msgstr "An unknown error has occurred. Please try your request again."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Unsupported API request: controller = %(controller)s, action = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Not enough parameters to build a valid rule."
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "This rule already exists in group %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/api/ec2/cloud.py:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: rescued"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2152,89 +2178,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2282,6 +2326,7 @@ msgstr ""
 #: 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 ""
 
@@ -2328,21 +2373,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2350,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 ""
 
@@ -2374,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 ""
 
@@ -2387,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 ""
 
@@ -2434,9 +2485,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2565,141 +2616,145 @@ msgstr ""
 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:1081
+#: 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:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: 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:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "instance %s: rescued"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2740,6 +2795,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 ""
 
@@ -2779,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 ""
 
@@ -2903,7 +2960,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2945,33 +3003,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp not running..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2982,40 +3040,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3050,7 +3115,7 @@ msgstr "group %s already exists"
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3099,7 +3164,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3293,30 +3358,36 @@ msgid "Create networks failed"
 msgstr "setting network host"
 
 #: 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 "
@@ -3328,7 +3399,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Not enough parameters to build a valid rule."
 
@@ -3346,16 +3417,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3381,7 +3452,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3440,12 +3511,17 @@ msgstr "Got exception: %s"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Release address %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Release address %s"
@@ -3464,107 +3540,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Going to start terminating instances"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3575,42 +3664,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3622,7 +3711,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3655,35 +3744,84 @@ msgstr "Launching VPN for %s"
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3704,320 +3842,320 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "received %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Caught error: %s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "setting network host"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "group %s already exists"
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "setting network host"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "Reboot instance %r"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Unexpected error raised: %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance %s: rescued"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Caught error: %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4031,253 +4169,253 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: 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:1335
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: 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:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: 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:3029
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorise security group ingress %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4342,12 +4480,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4368,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected error raised: %s"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: 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:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "setting network host"
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5139,11 +5297,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5159,15 +5317,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 "Adding console"
@@ -5247,7 +5424,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5269,44 +5446,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: 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:883
+#: 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:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: 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:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5402,47 +5579,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Failed to decrypt initialisation vector: %s"
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Failed to decrypt image file %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5649,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"
@@ -5848,155 +6025,156 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "instance %s: booted"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "setting network host"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revoke security group ingress %s"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Authorise security group ingress %s"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6017,12 +6195,12 @@ msgstr "Error starting xvp: %s"
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6225,11 +6403,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6279,11 +6467,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6713,86 +6896,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Going to start terminating instances"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6827,35 +7003,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6879,7 +7055,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6897,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 ""
@@ -6948,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"
@@ -7139,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7312,19 +7508,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7334,25 +7530,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7361,7 +7557,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7383,20 +7579,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7415,37 +7611,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7498,85 +7694,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Going to start terminating instances"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Going to start terminating instances"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Get console output for instance %s"
@@ -7661,24 +7857,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7688,7 +7884,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7702,22 +7898,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "instance %s: booted"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7834,12 +8026,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8093,12 +8285,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Failed to mount filesystem: %s"
@@ -8127,23 +8319,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Get console output for instance %s"
@@ -8157,7 +8349,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8513,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:1924
+#: 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:1931
+#: 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'"
@@ -8684,7 +8876,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creating a raw instance"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8723,240 +8915,240 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "volume group %s doesn't exist"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Going to try to terminate %s"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: 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:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8964,76 +9156,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9041,50 +9248,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9094,69 +9301,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Authentication Failure: %s"
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9175,15 +9387,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9374,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9422,7 +9635,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9430,7 +9643,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9438,7 +9651,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9650,7 +9863,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9796,32 +10009,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9836,34 +10049,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10077,12 +10290,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested return %s"
@@ -10190,101 +10403,101 @@ msgstr "Going to run %s instances..."
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "instance %s: booted"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Deleting user %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instance %s: rescued"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Deleting user %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10407,106 +10620,87 @@ msgstr "Unable to detach volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Calling getter %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -10526,54 +10720,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10838,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 "
@@ -11002,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 "
@@ -11069,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 ""
 
@@ -11432,32 +11626,32 @@ msgstr "NotFound raised: %s"
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11475,9 +11669,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 1fc3b3f81..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-17 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"
@@ -79,160 +79,160 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr "Flags path: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Virtual Interface creation failed"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "5 attempts to create virtual interface with unique mac address failed"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Not authorised."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "User does not have admin privileges"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Policy doesn't allow %(action)s to be performed."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Unacceptable parameters."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volume %(volume_id)s is not attached to anything"
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "The request is invalid."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Invalid input received"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -241,16 +241,16 @@ msgstr ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -259,123 +259,123 @@ msgstr ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "VBD not found in instance %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -383,86 +383,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: resuming"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -470,896 +470,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:798
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: 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:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1374,15 +1395,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1404,17 +1425,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1447,120 +1468,130 @@ 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:436
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1574,7 +1605,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1720,262 +1751,257 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: resuming"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Invalid cidr %(cidr)s."
@@ -2147,89 +2173,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2277,6 +2321,7 @@ msgstr ""
 #: 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 ""
 
@@ -2323,21 +2368,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2345,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 ""
 
@@ -2369,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 ""
 
@@ -2382,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 ""
 
@@ -2428,9 +2479,9 @@ msgstr "Instance %(instance_id)s is not running."
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2559,139 +2610,143 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Invalid volume"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2732,6 +2787,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 ""
 
@@ -2771,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 ""
 
@@ -2893,7 +2950,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2935,33 +2993,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Invalid snapshot"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2972,40 +3030,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3040,7 +3105,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3088,7 +3153,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3280,30 +3345,36 @@ 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 "
@@ -3315,7 +3386,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3332,16 +3403,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3365,7 +3436,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3424,12 +3495,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3448,107 +3524,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3559,42 +3648,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3606,7 +3695,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3639,35 +3728,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3688,315 +3826,315 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "instance %s: reset network"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "Rebooting instance %s"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance %s: resuming"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4010,246 +4148,246 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Virtual Interface creation failed"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: 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:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4314,12 +4452,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4340,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "volume %s: creating export"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: 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:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Invalid instance type %(instance_type)s."
@@ -5104,11 +5262,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5124,15 +5282,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5212,7 +5389,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5234,44 +5411,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5367,47 +5544,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5613,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 ""
@@ -5810,152 +5987,153 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "instance %s: suspending"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5976,12 +6154,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6185,11 +6363,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 "DB exception wrapped."
@@ -6239,11 +6427,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6674,86 +6857,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Invalid instance type %(instance_type)s."
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6788,35 +6964,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6840,7 +7016,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6858,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 ""
@@ -6909,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"
@@ -7100,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7272,19 +7468,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7294,25 +7490,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7321,7 +7517,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7343,20 +7539,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7375,37 +7571,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7458,85 +7654,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
@@ -7621,24 +7817,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7648,7 +7844,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7662,22 +7858,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "instance %s: suspending"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Virtual Interface creation failed"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7790,12 +7982,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8049,12 +8241,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Unable to locate volume %s"
@@ -8083,23 +8275,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Get console output for instance %s"
@@ -8113,7 +8305,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8469,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:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8640,7 +8832,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8679,238 +8871,238 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connection to melange failed"
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8918,76 +9110,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8995,50 +9202,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9048,69 +9255,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9129,15 +9341,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9328,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9376,7 +9589,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9384,7 +9597,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9392,7 +9605,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9605,7 +9818,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9752,32 +9965,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9792,34 +10005,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10031,11 +10244,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested return %s"
@@ -10141,101 +10354,101 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instance %s: resuming"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10358,106 +10571,87 @@ msgstr "Unable to detach volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Calling getter %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10473,54 +10667,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10784,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 "
@@ -10948,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 "
@@ -11015,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 ""
 
@@ -11373,32 +11567,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11416,9 +11610,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 fa2a9e8b0..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-17 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"
@@ -81,161 +81,161 @@ msgstr "Failed to terminate instance"
 msgid "Flags path: %s"
 msgstr "Flags path: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr "Exception in string format operation"
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr "Unknown"
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Virtual Interface creation failed"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "5 attempts to create virtual interfacewith unique mac address failed"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Not authorized."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "User does not have admin privileges"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Policy doesn't allow %(action)s to be performed."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Image %(image_id)s is not active."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Not authorized for image %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Unacceptable parameters."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 #, fuzzy
 msgid "Block Device Mapping is Invalid."
 msgstr "block_device_mapping %s"
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volume %(volume_id)s is not attached to anything"
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "The request is invalid."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Invalid input received"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "Invalid metadata"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr "Invalid metadata size"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Invalid Parameter: Unicode is not supported by the current database."
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -244,16 +244,16 @@ msgstr ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Group not valid. Reason: %(reason)s"
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr "Sort key supplied was not valid."
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -262,85 +262,85 @@ msgstr ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s is not ready"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Failed to suspend instance"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Failed to reset network: %(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Failed to set admin password on %(instance)s because %(reason)s"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Failed to set admin password on %(instance)s because %(reason)s"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Failed to reboot instance"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr "Failed to terminate instance"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Failed to reboot instance"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Service is unavailable at this time."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr "Insufficient compute resources."
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Compute service is unavailable at this time."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "The supplied hypervisor type of is invalid."
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "The instance requires a newer hypervisor version than has been provided."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -349,31 +349,31 @@ msgstr ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "The supplied device path (%(path)s) is invalid."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "The supplied device path (%(path)s) is in use."
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "The supplied device (%(device)s) is busy."
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Unacceptable CPU info"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s is not a valid IP v4/6 address."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -382,7 +382,7 @@ msgstr ""
 "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."
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -393,85 +393,85 @@ msgstr ""
 "the desired physical adapter. Expected vSwitch is %(expected)s, but the "
 "one associated is %(actual)s."
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Disk format %(disk_format)s is not acceptable"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Image %(image_id)s is unacceptable: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Instance %(instance_id)s is unacceptable: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s is unacceptable."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr "Expected a uuid but received %(uuid)s."
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr "Constraint not met."
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Resource could not be found."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "No fixed IP associated with id %(id)s."
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Volume %(volume_id)s could not be found."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snapshot %(snapshot_id)s could not be found."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "No target id found for volume %(volume_id)s."
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "No disk at %(location)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Could not find a handler for %(driver_type)s volume."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Invalid image href %(image_href)s."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Image %(image_id)s could not be found."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -482,65 +482,65 @@ msgstr ""
 " dynamically when they are listed for the first time. Have you listed "
 "image ids since adding this image?"
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Project %(project_id)s could not be found."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "Cannot find SR to read/write VDI."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Network %(network_id)s is still in use."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Network %(network_id)s is still in use."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s is required to create a network."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Network %(network_id)s could not be found."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Port %(port_id)s could not be found."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Network could not be found for bridge %(bridge)s"
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Network could not be found for uuid %(uuid)s"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Network could not be found with cidr %(cidr)s."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Network could not be found for instance %(instance_id)s."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "No networks defined."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -549,51 +549,51 @@ msgstr ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "Could not find the datastore reference(s) which the VM uses."
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Port %(port_id)s is still in use."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Network could not be found for instance %(instance_id)s."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "Network could not be found for instance %(instance_id)s."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "No fixed IP associated with id %(id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Fixed ip not found for address %(address)s."
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Instance %(instance_uuid)s has zero fixed ips."
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "Network host %(host)s has zero fixed ips in network %(network_id)s."
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
@@ -602,7 +602,7 @@ msgstr ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
@@ -611,121 +611,117 @@ msgstr ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr "More than one instance is associated with fixed ip address '%(address)s'."
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Fixed IP address %(address)s is invalid."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "Zero fixed ips available."
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "Zero fixed ips could be found."
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Floating ip %(address)s already exists."
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Floating ip not found for id %(id)s."
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "The DNS entry %(name)s already exists in domain %(domain)s."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Floating ip not found for address %(address)s."
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Floating ip not found for host %(host)s."
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "Multiple floating ips are found for address %(address)s."
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr "Floating ip pool not found."
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "Zero floating ips available."
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "Floating ip %(address)s is associated."
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "Floating ip %(address)s is not associated."
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "Zero floating ips exist."
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s not found."
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "Keypair %(name)s not found for user %(user_id)s"
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr "Certificate %(certificate_id)s not found."
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s could not be found."
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Compute host %(host)s could not be found."
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Could not find binary %(binary)s on host %(host)s."
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
@@ -734,56 +730,56 @@ msgstr ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Quota could not be found"
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "Unknown quota resources %(unknown)s."
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Quota for project %(project_id)s could not be found."
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Quota class %(class_name)s could not be found."
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Quota usage for project %(project_id)s could not be found."
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Quota reservation %(uuid)s could not be found."
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Quota exceeded for resources: %(overs)s"
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Security group %(security_group_id)s not found."
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr "Security group %(security_group_id)s not found for project %(project_id)s."
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/exception.py:747
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -792,7 +788,7 @@ msgstr ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 
-#: nova/exception.py:752
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -801,37 +797,37 @@ msgstr ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 
-#: nova/exception.py:757
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Migration %(migration_id)s could not be found."
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Migration not found for instance %(instance_id)s with status %(status)s."
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Console pool %(pool_id)s could not be found."
 
-#: nova/exception.py:784
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -840,17 +836,17 @@ msgstr ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 
-#: nova/exception.py:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Console %(console_id)s could not be found."
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Console for instance %(instance_uuid)s could not be found."
 
-#: nova/exception.py:798
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
@@ -859,81 +855,86 @@ msgstr ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 
-#: nova/exception.py:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Invalid console type %(console_type)s "
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Instance type %(instance_type_id)s could not be found."
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Instance type with name %(instance_type_name)s could not be found."
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Flavor %(flavor_id)s could not be found."
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, fuzzy, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr "Flavor access not found for %(flavor_id) / %(project_id) combination."
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "pool %s doesn't exist"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 #, fuzzy
 msgid "Timeout waiting for response from cell"
 msgstr "Timed out waiting for RPC response: %s"
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Destroying VDIs for Instance %(instance_uuid)s"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Scheduler Host Filter %(filter_name)s could not be found."
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -942,7 +943,7 @@ msgstr ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -951,146 +952,144 @@ msgstr ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "File %(file_path)s could not be found."
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr "Zero files could be found."
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "Virtual switch associated with the network adapter %(adapter)s not found."
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Network adapter %(adapter)s could not be found."
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Class %(class_name)s could not be found: %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "Action not allowed."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr "Rotation is not allowed for snapshots"
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr "Rotation param is required for backup image_type"
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "Key pair %(key_name)s already exists."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s already exists."
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Instance Type with name %(name)s already exists."
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Instance Type with ID %(flavor_id)s already exists."
 
-#: nova/exception.py:925
+#: 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:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s is not on shared storage: %(reason)s"
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s is not on local storage: %(reason)s"
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "Migration error"
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "Migration error"
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Malformed message body: %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Could not find config at %(path)s"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Could not load paste app '%(name)s' from %(path)s"
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr "When resizing, instances must change flavor!"
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr "Instance type's memory is too small for requested image."
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr "Instance type's disk is too small for requested image."
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Insufficient free memory on compute node to start %(uuid)s."
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Could not fetch bandwidth/cpu/disk metrics for this host."
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "No valid host was found. %(reason)s"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Quota exceeded"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
@@ -1099,41 +1098,41 @@ msgstr ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Maximum number of metadata items exceeds %(allowed)d"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr "Personality file limit exceeded"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr "Personality file path too long"
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr "Personality file content too long"
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr "Maximum number of key pairs exceeded"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Maximum number of security groups or rules exceeded"
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
@@ -1142,125 +1141,130 @@ msgstr ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Aggregate %(aggregate_id)s could not be found."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Aggregate %(aggregate_name)s already exists."
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "Aggregate %(aggregate_id)s has no host %(host)s."
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "Aggregate %(aggregate_id)s already has host %(host)s."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr "Unable to create instance type"
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Failed to set admin password on %(instance)s because %(reason)s"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Detected existing vlan with id %(vlan)d"
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Console for instance %(instance_uuid)s could not be found."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Volume %(volume_id)s could not be found."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Port %(port_id)s could not be found."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Marker %(marker)s could not be found."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr "Invalid id: %(val)s (expecting \"i-...\")."
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr "Task %(task_name)s is already running on host %(host)s"
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Task %(task_name)s is not running on host %(host)s"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_uuid)s is locked"
 
-#: nova/exception.py:1126
+#: 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:1131
+#: 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:1136
+#: 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:1140
+#: 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:1144
+#: 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:1150
+#: 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:1154
+#: 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:1159
+#: 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:1164
+#: 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:1168
+#: nova/exception.py:1174
 #, fuzzy, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
@@ -1303,111 +1307,126 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1173
+#: 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:1177
+#: 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:1181
+#: 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:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: 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:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Expected object of type: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1422,15 +1441,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Notifying Schedulers of capabilities ..."
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr "Failed to send state update notification"
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Failed to get info for disk %s"
@@ -1453,17 +1472,17 @@ msgstr "Created reservations %(reservations)s"
 msgid "Failed to commit reservations %(reservations)s"
 msgstr "Failed to commit reservations %(reservations)s"
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, fuzzy, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr "Created reservations %(reservations)s"
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr "Failed to roll back reservations %(reservations)s"
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, fuzzy, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr "Failed to roll back reservations %(reservations)s"
@@ -1496,122 +1515,132 @@ 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:436
-#, fuzzy, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr "Unknown base file: %s"
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Expected object of type: %s"
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Invalid server_string: %s"
 
-#: nova/utils.py:724
+#: 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:778 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:900 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:1060
+#: 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:1064
+#: 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:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr "%(name)s listening on %(host)s:%(port)s"
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Unable to find address %r"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Unable to find address %r"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Unable to find address %r"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr "Stopping WSGI server."
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr "WSGI server has stopped."
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "You must implement __call__"
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr "Loading app %(name)s from %(path)s"
@@ -1625,7 +1654,7 @@ msgid "Sourcing roles from deprecated X-Role HTTP header"
 msgstr "Sourcing roles from deprecated X-Role HTTP header"
 
 #: nova/api/sizelimit.py:53 nova/api/sizelimit.py:62 nova/api/sizelimit.py:76
-#: nova/api/metadata/password.py:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr "Request is too large."
 
@@ -1774,224 +1803,219 @@ msgstr "An unknown error has occurred. Please try your request again."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Unsupported API request: controller = %(controller)s, action = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Create snapshot of volume %s"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Could not find key pair(s): %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr "Quota exceeded, too many key pairs."
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "Import key %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr "Not enough parameters, need group_name or group_id"
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "%s Not enough parameters to build a valid rule"
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr "%s - This rule already exists in group"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Create volume from snapshot %s"
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr "Delete Failed"
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/api/ec2/cloud.py:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr "Attach Failed."
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr "Detach Volume Failed."
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr "No more floating IPs available"
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr "Unable to release IP Address."
 
-#: nova/api/ec2/cloud.py:1261
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Unable to associate IP Address, no fixed_ips."
 
-#: nova/api/ec2/cloud.py:1279
+#: 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 "multiple fixed_ips exist, using the first: %s"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr "Floating ip is already associated."
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr "l3driver call to add floating ip failed."
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr "Error, unable to associate floating ip."
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr "Floating ip is not associated."
 
-#: nova/api/ec2/cloud.py:1310
-#: 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:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Image must be available"
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "Going to stop instances"
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "Going to start instances"
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr "imageLocation is required"
 
-#: nova/api/ec2/cloud.py:1531
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr "Not allowed to modify attributes for image %s"
 
-#: nova/api/ec2/cloud.py:1641
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
@@ -2000,40 +2024,40 @@ msgstr ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 
-#: nova/api/ec2/cloud.py:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Couldn't stop instance with in %d sec"
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr "image of %(instance)s at %(now)s"
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Getting list of instances"
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance not present"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Getting list of instances"
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr "Invalid CIDR"
 
@@ -2209,89 +2233,107 @@ msgstr "Image metadata key too long"
 msgid "Invalid image metadata"
 msgstr "Invalid image metadata"
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 
 #: 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
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "Instance is in an invalid state for '%(action)s'"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Rejecting snapshot request, snapshots currently disabled"
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Instance snapshots are not permitted at this time."
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Loaded extension: %s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr "Ext name: %s"
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Ext alias: %s"
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr "Ext description: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Ext namespace: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Ext updated: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "Exception loading extension: %s"
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Loading extension %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "Calling extension factory %s"
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Failed to load extension %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Failed to load extension %(classpath)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Failed to load extension %(ext_name)s: %(exc)s"
 
+#: 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 "cannot understand JSON"
@@ -2339,6 +2381,7 @@ msgstr "There is no such action: %s"
 #: 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 "Malformed request body"
 
@@ -2385,21 +2428,24 @@ msgstr "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)
 msgid "subclasses must implement construct()!"
 msgstr "subclasses must implement construct()!"
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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]"
@@ -2407,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."
 
@@ -2431,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 ""
 
@@ -2444,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 "
@@ -2453,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."
 
@@ -2492,9 +2541,9 @@ msgstr "Host '%s' could not be found."
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 "Instance could not be found"
 
@@ -2623,141 +2672,145 @@ msgstr "Can not find requested image"
 msgid "Invalid key_name provided."
 msgstr "Invalid key_name provided."
 
+#: 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:1081
+#: 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:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: 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:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1049
-#: nova/api/openstack/compute/plugins/v3/servers.py:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1069
-#: nova/api/openstack/compute/plugins/v3/servers.py:1151
+#: 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:1091
-#: nova/api/openstack/compute/plugins/v3/servers.py:1173
+#: 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:1094
-#: nova/api/openstack/compute/plugins/v3/servers.py:1176
+#: 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:1100
-#: nova/api/openstack/compute/plugins/v3/servers.py:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: 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:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "Missing imageRef attribute"
 
 #: nova/api/openstack/compute/servers.py:1138
-#: nova/api/openstack/compute/plugins/v3/servers.py:1220
+#: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr "Invalid imageRef provided."
 
 #: nova/api/openstack/compute/servers.py:1165
-#: nova/api/openstack/compute/plugins/v3/servers.py:1253
+#: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "Missing flavorRef attribute"
 
 #: nova/api/openstack/compute/servers.py:1178
-#: nova/api/openstack/compute/plugins/v3/servers.py:1266
+#: 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:1182
 #: nova/api/openstack/compute/servers.py:1391
-#: nova/api/openstack/compute/plugins/v3/servers.py:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1188
-#: nova/api/openstack/compute/plugins/v3/servers.py:1276
+#: 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:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1210
-#: nova/api/openstack/compute/plugins/v3/servers.py:1298
+#: 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:1213
-#: nova/api/openstack/compute/plugins/v3/servers.py:1301
+#: 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:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
+#: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr "Invalid request body"
 
 #: nova/api/openstack/compute/servers.py:1237
-#: nova/api/openstack/compute/plugins/v3/servers.py:1325
+#: 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:1298
-#: nova/api/openstack/compute/plugins/v3/servers.py:1386
+#: 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:1332
-#: nova/api/openstack/compute/plugins/v3/servers.py:1420
+#: 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:1417
-#: nova/api/openstack/compute/plugins/v3/servers.py:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "Removing options '%(unk_opt_str)s' from query"
@@ -2798,6 +2851,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 "Server not found"
 
@@ -2838,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"
 
@@ -2965,7 +3020,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 "Only root certificate can be retrieved."
 
@@ -3008,34 +3064,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp not running..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Invalid snapshot"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, fuzzy, python-format
 msgid "Coverage doesn't have %s action"
 msgstr "Network does not have %s action"
@@ -3046,41 +3102,48 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s must be either 'MANUAL' or 'AUTO'."
 
 #: 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
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host and block_migration must be specified."
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Error in migrate %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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"
 
@@ -3115,7 +3178,7 @@ msgstr "Floating ip is not associated"
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr "Missing parameter dict"
 
@@ -3164,7 +3227,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Floating ip %(address)s is not associated."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3364,30 +3427,36 @@ msgid "Create networks failed"
 msgstr "Create failed"
 
 #: 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 "Quota limit must be -1 or greater."
 
 #: 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 "
@@ -3399,7 +3468,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr "Malformed scheduler_hints attribute"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Not enough parameters to build a valid rule."
 
@@ -3418,16 +3487,16 @@ msgstr "Showing network with id %s"
 msgid "security group default rule not found"
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Bad prefix for to_global_ipv6: %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "Security group not specified"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "Security group name cannot be empty"
 
@@ -3451,7 +3520,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 #, fuzzy
 msgid "Unknown service"
 msgstr "unknown guestmount error"
@@ -3511,12 +3580,17 @@ msgstr "Loaded extension: %s"
 msgid "Ext version: %i"
 msgstr "Ext description: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Release address %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Release address %s"
@@ -3535,107 +3609,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: nova/api/openstack/compute/plugins/v3/servers.py:1031
 #, fuzzy, python-format
 msgid "Running _create_extension_point for %s"
 msgstr "Calling extension factory %s"
 
-#: nova/api/openstack/compute/views/servers.py:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: 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:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3646,42 +3733,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Destroying VDIs for Instance %(instance_uuid)s"
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3693,7 +3780,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3726,35 +3813,84 @@ msgstr "Launching VPN for %s"
 msgid "Failed to load %s"
 msgstr "Failed to create VM %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "element is not a child"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3777,326 +3913,326 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "received %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "DB error: %s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "Reset network"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Zero fixed ips could be found."
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "No fixed ips associated to instance"
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Floating ip %(address)s already exists."
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "start address"
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "project"
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "Network not found"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s is required to create a network."
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "stop instance"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Unexpected error: %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 #, fuzzy
 msgid "PROJECT"
 msgstr "project"
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 #, fuzzy
 msgid "Must supply valid parameters to create instance_type"
 msgstr "Unable to create instance type"
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance not present"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 #, fuzzy
 msgid "Unknown error"
 msgstr "unknown guestmount error"
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "Table |%s| not created!"
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 #, fuzzy
 msgid "Valid instance type name is required"
 msgstr "%s is a valid instance name"
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "DB error: %s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: nova/cmd/manage.py:970
 #, fuzzy, python-format
 msgid "Key %(key)s set to %(value)s on instance type %(name)s"
 msgstr "%(key)s with value %(value)s failed validator %(name)s"
 
-#: nova/cmd/manage.py:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "hyperv vm state: %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4110,16 +4246,16 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr "Cannot run any more instances of this type."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Can only run %s more instances of this type."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
@@ -4128,7 +4264,7 @@ msgstr ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -4137,93 +4273,93 @@ msgstr ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr "Metadata property key blank"
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr "Metadata property key greater than 255 characters"
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr "Metadata property value greater than 255 characters"
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1268
+#: 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:1311
+#: 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:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate instance"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr "Going to try to stop instance"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr "Going to try to start instance"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr "Searching by: %s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr "snapshot for %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id is None. Assuming migration."
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4232,63 +4368,63 @@ msgstr ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2103
+#: 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:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr "Locking"
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr "Unlocking"
 
-#: nova/compute/api.py:2426
+#: 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:2540
+#: 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:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: 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:2903
+#: 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:2911
+#: nova/compute/api.py:2923
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4297,68 +4433,68 @@ msgstr ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 
-#: nova/compute/api.py:2917
+#: 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:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr "Quota exceeded, too many security groups."
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: 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:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr "Security group is still in use"
 
-#: nova/compute/api.py:3037
+#: 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:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: 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:3133
+#: 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:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr "Security group id should be integer"
 
@@ -4426,14 +4562,14 @@ msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr "names can only contain [a-zA-Z0-9_.- ]"
 
 #: nova/compute/flavors.py:101
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than 0"
-msgstr "Volume size '%s' must be an integer and greater than 0"
+#, python-format
+msgid "'%s' argument must be a positive integer"
+msgstr ""
 
 #: nova/compute/flavors.py:110
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than or equal to 0"
-msgstr "Volume size '%s' must be an integer and greater than 0"
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
 
 #: nova/compute/flavors.py:119
 #, fuzzy
@@ -4454,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Failed to terminate instance"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Rebooting instance after nova-compute restart."
 
-#: nova/compute/manager.py:601
+#: 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:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Failed to suspend instance"
 
-#: nova/compute/manager.py:616
+#: 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:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected status code"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr "Checking state"
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Setting up bdm %s"
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: 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:1004
+#: nova/compute/manager.py:1013
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:1090
+#: 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:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: nova/compute/manager.py:1101
+#: 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:1130
+#: 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:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr "Starting instance..."
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Floating ip pool not found."
 
-#: nova/compute/manager.py:1175
-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:1177
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Instance network_info: |%s|"
 
 #: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr "Deallocating network for instance"
 
-#: nova/compute/manager.py:1332
+#: 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:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s instance"
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignoring DiskNotFound: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignoring VolumeNotFound: %s"
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "terminating bdm %s"
 
-#: nova/compute/manager.py:1440
+#: 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:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr "Rebuilding instance"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: 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:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: 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:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr "Rebooting instance"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1876
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4713,25 +4869,25 @@ msgstr ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr "instance snapshotting"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1961
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4740,161 +4896,161 @@ msgstr ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1973
+#: 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:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Rotating out %d backups"
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Deleting image %s"
 
-#: nova/compute/manager.py:2014
+#: 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:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr "Root password set"
 
-#: nova/compute/manager.py:2028
+#: 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:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password failed: %s"
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr "error setting admin password"
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr "Rescuing"
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr "Unrescuing"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: 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:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance has no volume."
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "destination same as source!"
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr "Migrating"
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr "Pausing"
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr "Unpausing"
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr "Retrieving diagnostics"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr "Resuming"
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr "Reset network"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr "Inject network info"
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info to inject: |%s|"
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr "Get console output"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:3003
+#: 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:3054
+#: 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:3064
+#: nova/compute/manager.py:3113
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
@@ -4903,59 +5059,59 @@ msgstr ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 
-#: nova/compute/manager.py:3080
+#: 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:3111
+#: 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:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: 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:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr "_post_live_migration() is started.."
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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."
@@ -4963,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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr "Post operation of migration started"
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr "Updated the info_cache for instance"
 
-#: nova/compute/manager.py:3687
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4985,12 +5141,12 @@ msgstr ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 
-#: nova/compute/manager.py:3692
+#: 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:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
@@ -4999,26 +5155,26 @@ msgstr ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr "In ERROR state"
 
-#: nova/compute/manager.py:3721
+#: 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:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: nova/compute/manager.py:3799
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
@@ -5027,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:3768
+#: 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:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "Updating host status"
 
-#: nova/compute/manager.py:3936
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5054,11 +5210,11 @@ msgstr ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 
-#: nova/compute/manager.py:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: nova/compute/manager.py:4030
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
@@ -5067,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:4016
+#: 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:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: 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:4048
+#: 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:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: 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:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance is not (soft-)deleted."
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, skipping..."
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr "Reclaiming deleted instance"
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Loading compute driver '%s'"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Setting instance to %(state)s state."
@@ -5246,11 +5402,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr "Missing keys: %s"
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr "No compute host specified"
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "Unable to find host for Instance %s"
@@ -5266,16 +5422,37 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:322
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
 
+#: 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 ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+
+#: 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 "Adding console"
@@ -5357,7 +5534,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Failed to reboot instance"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5380,44 +5557,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Unrecognized read_deleted value '%s'"
 
-#: nova/db/sqlalchemy/api.py:662
+#: 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:883
+#: 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:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: 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:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: nova/db/sqlalchemy/api.py:2915
 #, python-format
 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5517,47 +5694,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr "Fetching image '%s' from glance"
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "Failed to download %(image_location)s to %(image_path)s"
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "Failed to decrypt %(image_location)s to %(image_path)s"
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "Failed to untar %(image_location)s to %(image_path)s"
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "Failed to upload %(image_location)s to %(image_path)s"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Failed to decrypt initialization vector: %s"
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Failed to decrypt image file %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr "Unsafe filenames in image"
 
@@ -5774,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"
@@ -5983,156 +6160,156 @@ 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"
 
-#: nova/network/quantumv2/__init__.py:67
-#, fuzzy
-msgid "quantum authentication failed"
-msgstr "Authentication error"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr "allocate_for_instance() for %s"
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr "empty project id for instance %s"
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "Host not found"
 
-#: nova/network/quantumv2/api.py:280
+#: nova/network/quantumv2/api.py:278
 #, python-format
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr "Fail to delete port %(portid)s with failure: %(exception)s"
 
-#: nova/network/quantumv2/api.py:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr "deallocate_for_instance() for %s"
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr "Failed to delete quantum port %(portid)s "
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr "Failed to delete quantum port %(portid)s "
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr "get_instance_nw_info() for %s"
 
-#: nova/network/quantumv2/api.py:407
+#: nova/network/quantumv2/api.py:405
 #, fuzzy, python-format
 msgid ""
 "Unable to update port %(portid)s on subnet %(subnet_id)s with failure: "
 "%(exception)s"
 msgstr "Fail to delete port %(portid)s with failure: %(exception)s"
 
-#: nova/network/quantumv2/api.py:437
+#: nova/network/quantumv2/api.py:435
 #, fuzzy, python-format
 msgid "Unable to update port %(portid)s with failure: %(exception)s"
 msgstr "Fail to delete port %(portid)s with failure: %(exception)s"
 
-#: nova/network/quantumv2/api.py:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr "validate_networks() for %s"
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Multiple floating IP pools matches found for name '%s'"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Security group id should be integer"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr "Security group %(security_group_id)s not found for project %(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6156,12 +6333,12 @@ msgstr "error setting admin password"
 msgid "Invalid version string"
 msgstr "Invalid server_string: %s"
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6367,11 +6544,21 @@ msgstr "Caught %s, stopping children"
 msgid "Waiting on %d children to exit"
 msgstr "Waiting on %d children to exit"
 
-#: nova/openstack/common/strutils.py:72
+#: 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
+#, fuzzy, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr "Unknown base file: %s"
+
 #: nova/openstack/common/db/sqlalchemy/session.py:462
 msgid "DB exception wrapped."
 msgstr "DB exception wrapped."
@@ -6423,11 +6610,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr "Could not send notification to %(topic)s. Payload=%(message)s"
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr "Failed to load plugin %(plug)s: %(exc)s"
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6863,72 +7045,63 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr "No key defining hosts for topic '%s', see ringfile"
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "Is the appropriate service running?"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "Could not find another compute"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr "Exception during scheduler.run_instance"
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr "Driver must implement schedule_prep_resize"
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr "Driver must implement schedule_run_instance"
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 #, fuzzy
 msgid "Driver must implement select_hosts"
 msgstr "Driver must implement schedule_run_instance"
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "Attempting to build %(num_instances)d instance(s)"
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "Request: %s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Destroying VDIs for Instance %(instance_uuid)s"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr "Invalid value for 'scheduler_max_attempts', must be >= 1"
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
@@ -6937,17 +7110,17 @@ msgstr ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Filtered %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "Filtered %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6984,36 +7157,36 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr "Received %(service_name)s service update from %(host)s."
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, fuzzy, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr "Received %(service_name)s service update from %(host)s."
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "No service for compute ID %s"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
-#, 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'"
 msgstr "Could not stat scheduler options file %(filename)s: '%(e)s'"
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "Could not decode scheduler options: '%(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
@@ -7036,7 +7209,7 @@ msgstr "%(host_state)s fails instance_type extra_specs requirements"
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7054,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 ""
@@ -7117,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"
@@ -7126,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"
@@ -7311,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 "
@@ -7320,53 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "Internal error"
 
-#: nova/tests/compute/test_compute.py:4135
+#: 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:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "unknown guestmount error"
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7495,19 +7688,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Creating files in %s to simulate guest agent"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Removing simulated guest agent files in %s"
@@ -7517,25 +7710,25 @@ msgstr "Removing simulated guest agent files in %s"
 msgid "Added %(filepath)s to config drive"
 msgstr "Added %(filepath)s to config drive"
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr "Compute driver option required, but not specified"
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr "Loading compute driver '%s'"
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Unable to load the virtualization driver: %s"
@@ -7545,7 +7738,7 @@ msgstr "Unable to load the virtualization driver: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "Attempted to unfilter instance which is not filtered"
 
@@ -7567,20 +7760,20 @@ msgstr "Adding security group rule: %r"
 msgid "Adding provider rule: %s"
 msgstr "Adding provider rule: %s"
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info' parsing failed."
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr "fmt=%(fmt)s backed by: %(backing_file)s"
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Converted to raw, but format is now %s"
@@ -7599,37 +7792,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "get_info called for instance"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7683,85 +7876,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "floating IP allocation for instance |%s|"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Fetching image '%s' from glance"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Injecting %(injection)s into image %(img_id)s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "empty project id for instance %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "empty project id for instance %s"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: nova/virt/baremetal/pxe.py:480
 #, fuzzy, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr "Timeout while waiting on RPC response."
 
-#: nova/virt/baremetal/tilera.py:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "empty project id for instance %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr "Node is unknown error state."
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Unable to find host for Instance %s"
@@ -7849,24 +8042,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, fuzzy, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr "Could not determine iscsi initiator name"
@@ -7876,7 +8069,7 @@ msgstr "Could not determine iscsi initiator name"
 msgid "No fixed PXE IP is associated to %s"
 msgstr "No fixed ips associated to instance"
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7890,23 +8083,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "No more floating ips available."
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "partition %s not found"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Virtual Interface creation failed"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "partition %s not found"
@@ -8021,12 +8209,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8283,12 +8471,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "injected file path not valid"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Failed to update agent: %(resp)r"
@@ -8317,24 +8505,24 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr "The ISCSI initiator name can't be found. Choosing the default one"
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr "plug_vifs called"
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 #, fuzzy
 msgid "unplug_vifs called"
 msgstr "plug_vifs called"
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr "ensure_filtering_rules_for_instance called"
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr "unfilter_instance called"
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr "get_console_output called"
 
@@ -8347,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:3943
+#: 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"
@@ -8714,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:1924
+#: 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:1931
+#: 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"
@@ -8878,7 +9066,7 @@ msgstr "Detach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creating snapshot for instance %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr "Could not determine iscsi initiator name"
 
@@ -8917,216 +9105,216 @@ msgstr "Unable to find vbd for vdi %s"
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "Volume %s does not exist in Nexenta SA"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr "Can not handle authentication request for %d credentials"
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr "During wait destroy, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr "Instance destroyed successfully."
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Going to stop instances"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr "Error from libvirt during undefineFlags. Retrying with undefine"
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
-msgstr "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Failed to cleanup directory %(target)s: %(e)s"
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "Could not determine iscsi initiator name"
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "Could not determine iscsi initiator name"
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr "During detach_volume, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "No networks defined."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "During detach_volume, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "No networks defined."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr "Instance soft rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr "Failed to soft reboot instance."
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr "Instance shutdown successfully."
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr "Instance rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr "Instance is running"
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: 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:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: 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:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr "Creating image"
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr "Using config drive"
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: nova/virt/libvirt/driver.py:2053
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
@@ -9135,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:2039
+#: 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:2043
+#: 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:2047
+#: 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:2063
+#: nova/virt/libvirt/driver.py:2083
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
@@ -9156,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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9164,19 +9352,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9185,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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: 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:2642
+#: 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:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2708
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9220,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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: 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:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9246,21 +9449,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9269,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:3077
+#: 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:3085
+#: 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:3130
+#: nova/virt/libvirt/driver.py:3174
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9286,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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9295,7 +9498,7 @@ msgstr ""
 "Instance launched has CPU info:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9310,7 +9513,7 @@ msgstr ""
 "\n"
 "Refer to %(u)s"
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9319,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:3234
+#: 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:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: nova/virt/libvirt/driver.py:3568
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9343,41 +9546,46 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
-msgstr "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: 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:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr "Instance running successfully."
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr "Starting finish_migration"
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr "Starting finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3915
-#, fuzzy, python-format
-msgid "Checking instance files accessability%(instance_path)s"
-msgstr "Deleting instance files %(target)s"
+#: nova/virt/libvirt/driver.py:3982
+#, python-format
+msgid "Checking instance files accessability %s"
+msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
 msgid ""
@@ -9397,15 +9605,15 @@ msgstr "Ensuring static filters"
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
+msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Setup Basic Filtering"
 
@@ -9607,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: 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:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "Ensuring bridge %s"
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9655,7 +9864,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9663,7 +9872,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9671,7 +9880,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9891,7 +10100,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -10044,32 +10253,32 @@ msgstr ""
 "Must specify vmwareapi_host_ip,vmwareapi_host_username and "
 "vmwareapi_host_password to usecompute_driver=vmwareapi.VMWareESXDriver"
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "marker [%s] not found"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "In vmwareapi:_create_session, got this exception: %s"
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "In vmwareapi:_call_method, got this exception: %s"
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "Task [%(task_name)s] %(task_ref)s status: success"
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "In vmwareapi:_poll_task, Got this error %s"
@@ -10084,34 +10293,34 @@ msgstr "Error(s) %s occurred in the call to RetrieveProperties"
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "Property %(attr)s not set for the managed object %(name)s"
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr "There is no VM registered"
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "Virtual Machine with ref %s is not there"
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "Logging out a session that is invalid or already logged out: %s"
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr "Session is faulty"
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "Session Invalid"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " No Virtual Machine has been registered yet"
@@ -10344,12 +10553,12 @@ msgstr "Doing hard reboot of VM"
 msgid "Did hard reboot of VM"
 msgstr "Did hard reboot of VM"
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Destroying VM"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "VM destroyed"
@@ -10467,36 +10676,36 @@ msgstr "Powering off the VM"
 msgid "Powered on the VM"
 msgstr "Powered off the VM"
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Updating progress to %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Creating volume: %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr "instance not present"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
@@ -10505,66 +10714,66 @@ msgstr ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Creating volume: %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Create volume from snapshot %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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 "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "Automatically hard rebooting"
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics not implemented for vmwareapi"
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 #, fuzzy
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr "Reconfiguring VM instance to attach the image disk"
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 #, fuzzy
 msgid "Reconfigured VM instance to set the machine id"
 msgstr "Reconfigured VM instance to attach the image disk"
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, fuzzy, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, fuzzy, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Creating directory with path %s"
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Created directory with path %s"
@@ -10687,12 +10896,12 @@ msgstr "Failed to find volume in db"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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 "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: 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. "
@@ -10701,74 +10910,55 @@ msgstr ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:111 nova/virt/xenapi/vmops.py:1650
+#: 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 "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr "Querying agent version"
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr "Reached maximum time attempting to query agent version"
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr "Updating agent to %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "Setting admin password"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr "Injecting file path: %r"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr "Resetting network"
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
@@ -10776,7 +10966,7 @@ msgstr ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
@@ -10784,15 +10974,15 @@ msgstr ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr "XenServer tools are not installed in this image"
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -10811,54 +11001,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr "Failure while cleaning up attached VDIs"
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr "Could not determine key: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr "Host startup on XenServer is not supported."
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "Unable to log in to XenAPI (is the Dom0 disk full?)"
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr "Host is member of a pool, but DB says otherwise"
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr "Calling setter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11130,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 "
@@ -11161,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 "
@@ -11227,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: "
@@ -11279,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 "
@@ -11303,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 "
@@ -11370,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 "
@@ -11388,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 "
@@ -11409,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%% "
@@ -11418,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"
 
@@ -11740,32 +11930,32 @@ msgstr "download_vhd failed: %r"
 msgid "Error in handshake: %s"
 msgstr "Error in handshake: %s"
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr "Invalid request: %s"
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr "Request: %s"
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr "Request made with missing token: %s"
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr "Request made with invalid token: %s"
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr "Unexpected error: %s"
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "Starting nova-xvpvncproxy node (version %s)"
@@ -11785,9 +11975,21 @@ msgstr "status must be available"
 msgid "status must be 'available'"
 msgstr "status must be available"
 
-#~ msgid "Cannot reboot instance: %s"
-#~ msgstr ""
+#~ msgid "Cannot disassociate auto assigined floating ip"
+#~ msgstr "Cannot disassociate auto assigined floating ip"
 
-#~ msgid "No Volume Connector found."
+#~ 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 05e328bb1..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-17 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"
@@ -84,305 +84,305 @@ msgstr "Fallo a reinicia la instancia"
 msgid "Flags path: %s"
 msgstr "Ruta a las opciones: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Fallo al desencriptar el texto"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Fallo al desencriptar el texto"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Creacion de interfaz virtual fallida"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "Fallaron los 5 intentos de crear una interfaz virtual con una dirección "
 "mac única"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "No Autorizado"
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "La política no permite que la %(action)s se realice"
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "La imagen %(image_id)s es inaceptable: %(reason)s"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Parametros inaceptables"
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volumen %(volume_id)s no está conectado con nada"
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "La petición es inválida."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Entrada invalida recibida"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Volumen inválido"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Firma invalida para el usuario %s"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Rango de puertos invalido %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP invalido %(protocol)s"
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Tipo de contenido invalido %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Cidr %(cidr)s invalido"
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "La instacia %(instance_id)s no se esta ejecutando"
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Fallo al suspender la instancia"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "El servicio no esta disponible en este momento"
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "El servicio de computo no esta disponible en este momento"
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
 "(%(host)s)"
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Informacion del CPU inaceptable"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s no es una direccion IP v4/6 valida"
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -390,86 +390,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato de disco %(disk_format)s no es aceptable"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "La imagen %(image_id)s es inaceptable: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Cidr %(cidr)s invalido"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instancia %s: rescatada"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -477,899 +477,920 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 "El punto de montaje %(mountpoint)s esta unido a la instancia "
 "%(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "configurando la red del host"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:798
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Tipo de contenido invalido %(content_type)s."
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "el grupo de volumenes %s no existe"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "No se puede unir la imagen con el loopback: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "No se puede unir la imagen con el loopback: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: 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:1140
+#: 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:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: 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:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1384,15 +1405,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Fallo al generar metadatos para la ip %s"
@@ -1415,17 +1436,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1458,120 +1479,130 @@ 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:436
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Imposible encontrar SR en VBD %s"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Imposible encontrar SR en VBD %s"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Imposible encontrar SR en VBD %s"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1585,7 +1616,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1732,265 +1763,260 @@ msgstr "Ha sucedido un error desconocido. Por favor repite el intento de nuevo."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Creando par de claves %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Borrar para de claves %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Protocolo IP invalido %(protocol)s"
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "No hay regla para los parámetros especificados."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regla ya existe en el grupo %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Crear volumen de %s GB"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "atributo no soportado: %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Asignar dirección"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar dirección %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "usuario o grupo no especificado"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "sólo el grupo \"all\" está soportado"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type debe ser añadir o eliminar"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Actualizando imagen %s públicamente"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instancia %s: rescatada"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Cidr %(cidr)s invalido"
@@ -2162,89 +2188,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2292,6 +2336,7 @@ msgstr ""
 #: 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 ""
 
@@ -2338,21 +2383,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2360,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 ""
 
@@ -2384,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 ""
 
@@ -2397,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 ""
 
@@ -2444,9 +2495,9 @@ msgstr "La instacia %(instance_id)s no esta suspendida"
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2575,142 +2626,146 @@ msgstr ""
 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:1081
+#: 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:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: 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:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "instancia %s: rescatada"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2751,6 +2806,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 ""
 
@@ -2790,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 ""
 
@@ -2914,7 +2971,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2956,33 +3014,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Captura no valida"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2993,40 +3051,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3061,7 +3126,7 @@ msgstr "el grupo %s ya existe"
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3110,7 +3175,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3305,30 +3370,36 @@ msgid "Create networks failed"
 msgstr "configurando la red del host"
 
 #: 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 "
@@ -3340,7 +3411,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3358,16 +3429,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3393,7 +3464,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3452,12 +3523,17 @@ msgstr "Obtenida excepción %s"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Liberar dirección %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Liberar dirección %s"
@@ -3476,107 +3552,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: 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:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3587,42 +3676,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3634,7 +3723,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3667,35 +3756,84 @@ msgstr "Lanzando VPN para %s"
 msgid "Failed to load %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3716,320 +3854,320 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "recibido %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "configurando la red del host"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "Asignar dirección"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "el grupo %s ya existe"
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "configurando la red del host"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "Reiniciar instancia %r"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instancia %s: rescatada"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Capturado error: %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4043,257 +4181,257 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
 "este tipo."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
 "este tipo."
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: 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:1252
+#: 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:1258
+#: 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:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1335
+#: 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:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: 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:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:3029
+#: 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:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: 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:3145
+#: 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:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4358,12 +4496,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4384,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4406,655 +4544,675 @@ msgstr ""
 "Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
 "(%(host)s)"
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instancia %s: reiniciada"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: 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:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: 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."
@@ -5154,11 +5312,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5174,15 +5332,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5264,7 +5441,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5287,44 +5464,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: 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:883
+#: 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:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: 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:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instancia %s: rescatada"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5420,47 +5597,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5667,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"
@@ -5864,155 +6041,156 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "instancia %s: arrancada"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "configurando la red del host"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Capturado error: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6033,12 +6211,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6242,11 +6420,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 "excepción DB empaquetada."
@@ -6296,11 +6484,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6732,86 +6915,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Tipo de instancia inválido %(instance_type)s."
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6848,35 +7024,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6900,7 +7076,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6918,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 ""
@@ -6969,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"
@@ -7160,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "Ejecutando instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "Después de terminar las instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7333,19 +7529,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7355,25 +7551,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7382,7 +7578,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7405,20 +7601,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7437,37 +7633,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7520,85 +7716,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
@@ -7683,24 +7879,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7710,7 +7906,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7724,22 +7920,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "instancia %s: arrancada"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Creacion de interfaz virtual fallida"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7852,12 +8044,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8112,12 +8304,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Fallo al montar el sistema de ficheros: %s"
@@ -8146,23 +8338,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Obtener salida de la consola para la instancia %s"
@@ -8176,7 +8368,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8532,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:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8703,7 +8895,7 @@ msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8742,240 +8934,240 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "el grupo de volumenes %s no existe"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Conexión a libvirt rota"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8983,76 +9175,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9060,50 +9267,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9113,69 +9320,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Fallo de autenticación: %s"
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: 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 %(path)s since it looks like volume"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3609
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9194,15 +9406,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9393,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9441,7 +9654,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9449,7 +9662,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9457,7 +9670,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9671,7 +9884,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9818,32 +10031,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9858,34 +10071,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10099,12 +10312,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10211,101 +10424,101 @@ msgstr "Vamos a ejecutar %s insntacias..."
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Borrando usuario %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instancia %s: rescatada"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Borrando usuario %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10432,106 +10645,87 @@ msgstr ""
 "El punto de montaje %(mountpoint)s se desligó de la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Llanado al adquiridor %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10550,54 +10744,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "Lanzando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake no tiene una implementación para %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10862,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 "
@@ -11092,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 ""
 
@@ -11453,32 +11647,32 @@ msgstr "No encontrado: %s"
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11496,9 +11690,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 c0457f642..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-17 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) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 fc142db0d..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-17 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"
@@ -82,163 +82,163 @@ msgstr "Échec du redémarrage de l'instance"
 msgid "Flags path: %s"
 msgstr "Chemin des propriétés: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Une exception inconnue s'est produite."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Échec du décryptage du text"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Échec du décryptage du text"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "La création de l'Interface Virtuelle a échoué"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "Les 5 tentatives de création de l'interface virtuelle avec une adresse "
 "MAC unique ont échoué"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Non autorisé."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Le réglage des droits n'autorise pas %(action)s à être effectué(e)(s)"
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "L'image %(image_id)s n'a pas été trouvée."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Paramètres inacceptables."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Le volume %(volume_id)s n'est lié à rien"
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "La paire de clés de donnée n'est pas valide"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "La requête est invalide."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Entrée invalide reçue"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Volume invalide"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Signature non valide pour l'utilisateur %s"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "La plage de port %(from_port)s:%(to_port)s. %(msg)s est invalide"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Le protocole IP %(protocol)s est invalide"
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Le type de contenu %(content_type)s est invalide"
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Le cidr %(cidr)s est invalide"
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -247,16 +247,16 @@ msgstr ""
 "Impossible d'effectuer l'action '%(action)s' sur l'ensemble "
 "%(aggregate_id)s. Raison: %(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -265,90 +265,90 @@ msgstr ""
 "L'instance %(instance_uuid)s dans %(attr)s %(state)s. Impossible de "
 "%(method)s pendant que l'instance est dans cet état."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "L'instance %(instance_id)s  ne fonctionne pas."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "L'instance %(instance_id)s  n'est pas suspendue"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Le service est indisponible actuellement."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Le service de calcul est indisponible actuellement."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Impossible de migrer l'instance (%(instance_id)s) vers l'hôte actuel "
 "(%(host)s)."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Le type de l'hyperviseur fourni n'est pas valide."
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 "L'instance nécessite une version plus récente de l'hyperviseur que celle "
 "fournie."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -357,31 +357,31 @@ msgstr ""
 "Le chemin d'accès du disque (%(path)s)  existe déjà, il n'était pas prévu"
 " d'exister."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Le chemin de périphérique (%(path)s) est invalide."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "Le chemin de périphérique (%(path)s) est invalide."
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Le chemin de périphérique (%(path)s) est invalide."
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Info CPU inacceptable"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s n'est pas une adresse IP v4/6 valide"
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -391,7 +391,7 @@ msgstr ""
 " VLAN prévu est %(tag)s, mais celui qui est associé avec le groupe de "
 "port est %(pgroup)s."
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -402,86 +402,86 @@ msgstr ""
 "l'adaptateur physique souhaité. VSwitch est %(expected)s, mais la "
 "principale association est %(actual)s."
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Le format de disque %(disk_format)s n'est pas acceptable"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "L'image %(image_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "L'instance %(instance_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s est inaccepatble."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Le cidr %(cidr)s est invalide"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: récupérée"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "La ressource n'a pas pu être trouvée."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "Pas d'adresse IP fixe associée avec l'id %(id)s."
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Le volume %(volume_id)s n'a pas pu être trouvé."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Aucun disque sur %(location)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Impossible de trouver un gestionnaire pour le %(driver_type)s de volume."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "L'image href %(image_href)s est invalide."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "L'image %(image_id)s n'a pas été trouvée."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -489,65 +489,65 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Le projet %(project_id)s n'a pas été trouvé."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "Impossible de trouver le SR pour lire/écrire le VDI."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s est requis pour créer un réseau."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Aucun réseau trouvé pour le pont %(bridge)s"
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Aucun réseau trouvé pour l'uuid %(uuid)s"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Aucun réseau trouvé avec le cidr %(cidr)s."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Aucun réseau trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Aucun réseau défini."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -556,53 +556,53 @@ msgstr ""
 "L'uuid réseau %(network_uuid)s n'est pas présent ou n'a pas été affecté "
 "au projet %(project_id)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Aucun réseau trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "Aucun réseau trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "Pas d'adresse IP fixe associée avec l'id %(id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Pas d'IP fixe trouvée pour l'adresse %(address)s."
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "L'instance %(instance_id)s n'a aucunes IPs fixes"
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 "Le réseau hôte %(host)s n'a aucunes IPs fixes dans le réseau "
 "%(network_id)s."
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "L'instance %(instance_id)s ne peut avoir l'IP fixe '%(ip)s'."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
@@ -611,187 +611,183 @@ msgstr ""
 "L'adresse IP fixe (%(address)s) n'existe pas dans le réseau "
 "(%(network_uuid)s)."
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "L'adresse IP fixe %(address)s est déjà utilisée."
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "L'adresse IP fixe %(address)s est invalide."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "Aucunes IPs fixes disponibles."
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "Aucunes IPs fixes trouvées."
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "L'entrée DNS %(name)s existe déjà dans le domaine %(domain)s."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Aucune IP dynamique trouvée pour l'adresse %(address)s."
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Aucune IP dynamique trouvée pour l'hôte %(host)s."
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "Aucune IP dynamique trouvée pour l'adresse %(address)s."
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "La paire de clés %(name)s est introuvable pour l'utilisateur %(user_id)s"
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr "Le certificat %(certificate_id)s non trouvé."
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "L'hôte %(host)s ne peut pas être trouvé."
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "L'hôte de calcul %(host)s ne peut pas être trouvé."
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Impossible de trouver le binaire %(binary)s sur l'hôte %(host)s."
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "La clé d'accès %(access_key)s ne peut pas être trouvée."
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "L'utilisateur %(user_id)s n'a pas été trouvé."
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Groupe de sécurité %(security_group_id)s non trouvé."
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Groupe de sécurité %(security_group_id)s non trouvé pour le projet "
 "%(project_id)s."
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/exception.py:747
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -800,7 +796,7 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s est déjà associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:752
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -809,138 +805,143 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s n'est pas associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:757
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "La migration %(migration_id)s ne peut être trouvée."
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 "Migration non trouvée pour l'instance %(instance_id)s avec le statut "
 "%(status)s."
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "La console %(console_id)s ne peut être trouvée."
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "La console pour l'instance %(instance_id)s ne peut être trouvée."
 
-#: nova/exception.py:798
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "La console pour l'instance %(instance_id)s ne peut être trouvée."
 
-#: nova/exception.py:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Le type de console %(console_type)s est invalide "
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Le type d'instance %(instance_type_id)s ne peut être trouvé."
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Le type d'instance avec le nom %(instance_type_name)s ne peut être trouvé."
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Le Flavor %(flavor_id)s ne peut être trouvé."
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "Le groupe de volume %s n'existe pas"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "La plannification de filtre hôte %(filter_name)s ne peut être trouvée."
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -949,335 +950,340 @@ msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type 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:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "La console pour l'instance %(instance_id)s ne peut être trouvée."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Le volume %(volume_id)s n'a pas pu être trouvé."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "L'image %(image_id)s n'a pas été trouvée."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Aucune IP dynamique trouvée pour l'hôte %(host)s."
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: 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:1140
+#: 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:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1165
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
@@ -1286,122 +1292,137 @@ msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/exception.py:1164
+#: 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:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: 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:1177
+#: 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:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: 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:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1416,15 +1437,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
@@ -1447,17 +1468,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1490,120 +1511,130 @@ 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:436
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Impossible de trouver SR du VDB %s"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Impossible de trouver SR du VDB %s"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Impossible de trouver SR du VDB %s"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "Vous devez implémenter __call__"
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1617,7 +1648,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1771,273 +1802,268 @@ msgstr ""
 "Requête API non supportée : controleur = %(controller)s, action = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Création du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Pas assez de parametres pour contruire un règle valide."
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Le protocole IP %(protocol)s est invalide"
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Pas de règle pour les paramètres spécifiés."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Cette règle existe déjà dans le groupe %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Création d'un volume de %s Go"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/api/ec2/cloud.py:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "attribut non reconnu : %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Allocation d'adresse"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Association de l'adresse %(public_ip)s avec l'instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Début de la destruction d'instance"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "Utilisateur ou groupe non spécifié"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "Seul le group \"tous\" est supporté"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 "le type d'opération (operation_type) doit être ajout (add) ou suppression"
 " (remove)"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Mis à jour de la publication de l'image %s"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: récupérée"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Le cidr %(cidr)s est invalide"
@@ -2209,89 +2235,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2339,6 +2383,7 @@ msgstr ""
 #: 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 ""
 
@@ -2385,21 +2430,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2407,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 ""
 
@@ -2431,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 ""
 
@@ -2444,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 ""
 
@@ -2491,9 +2542,9 @@ msgstr "L'hôte %(host)s ne peut pas être trouvé."
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2622,142 +2673,146 @@ msgstr ""
 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:1081
+#: 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:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: 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:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: 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:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2798,6 +2853,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 ""
 
@@ -2837,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 ""
 
@@ -2961,7 +3018,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -3003,34 +3061,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp non actif..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Snapshot invalide"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -3041,40 +3099,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3109,7 +3174,7 @@ msgstr "L'IP dynamique %(address)s n'est pas associée."
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3160,7 +3225,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3355,30 +3420,36 @@ msgid "Create networks failed"
 msgstr "Aucun réseau défini."
 
 #: 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 "
@@ -3390,7 +3461,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Pas assez de parametres pour contruire un règle valide."
 
@@ -3409,16 +3480,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3444,7 +3515,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3503,12 +3574,17 @@ msgstr "Reçu exception : %s"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Désallocation de l'adresse %s"
@@ -3527,107 +3603,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: 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:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3638,42 +3727,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3685,7 +3774,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3718,35 +3807,84 @@ 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:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3767,322 +3905,322 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "%s reçu"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "adresse de départ"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Aucunes IPs fixes trouvées."
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "adresse de départ"
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s est requis pour créer un réseau."
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "instance %s: récupérée"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4096,257 +4234,257 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
 " type de plus."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
 " type de plus."
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: 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:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: 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:1335
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: 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:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: 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:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: 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:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: 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:3029
+#: 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:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: 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:3145
+#: 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:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4411,12 +4549,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4437,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: nova/compute/manager.py:460
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4459,658 +4597,678 @@ msgstr ""
 "Impossible de migrer l'instance (%(instance_id)s) vers l'hôte actuel "
 "(%(host)s)."
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: 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:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: 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:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: 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:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: re-démarrée"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: 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:2418
+#: 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:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: 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:2920
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: 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:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: a démarrée"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: 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."
@@ -5211,11 +5369,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5231,15 +5389,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 "Ajout de console"
@@ -5321,7 +5498,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5344,44 +5521,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: 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:883
+#: 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:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: 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:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "instance %s: récupérée"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5477,47 +5654,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Impossible de déchiffrer le vecteur d'initialisation : %s"
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Impossible de déchiffrer le fichier image %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5725,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"
@@ -5923,157 +6100,158 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "Aucuns types d'instance trouvés."
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Erreur interceptée : %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Groupe de sécurité %(security_group_id)s non trouvé pour le projet "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6096,12 +6274,12 @@ msgstr "Erreur au démarrage xvp : %s"
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6305,11 +6483,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6359,11 +6547,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6795,86 +6978,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "L'instance de type %(instance_type)s est invalide."
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6911,35 +7087,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6963,7 +7139,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6981,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 ""
@@ -7032,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"
@@ -7223,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "Instance actives : %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "Après l'arrêt d'instances : %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7396,19 +7592,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7418,25 +7614,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7445,7 +7641,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7468,20 +7664,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7500,37 +7696,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7583,85 +7779,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Début de la destruction d'instance"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Début de la destruction d'instance"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
@@ -7746,24 +7942,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7773,7 +7969,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr "Pas d'adresse IP fixe associée avec l'id %(id)s."
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7787,23 +7983,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "Aucunes IPs fixes disponibles."
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "Aucuns types d'instance trouvés."
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "La création de l'Interface Virtuelle a échoué"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7920,12 +8111,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8180,12 +8371,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Impossible de monter le système de fichier : %s"
@@ -8214,23 +8405,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Récupération de la sortie de la console de l'instance %s"
@@ -8244,7 +8435,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8600,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:1924
+#: 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:1931
+#: 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'"
@@ -8771,7 +8962,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8810,244 +9001,244 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "Le groupe de volume %s n'existe pas"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Aucun réseau défini."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Aucun réseau défini."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: 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:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9055,76 +9246,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9132,50 +9338,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9185,69 +9391,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Echec d'authentification : %s"
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: 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 %(path)s since it looks like volume"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3609
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9266,15 +9477,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9465,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9513,7 +9725,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9521,7 +9733,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9529,7 +9741,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9743,7 +9955,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9890,32 +10102,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9930,34 +10142,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10171,12 +10383,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested renvoi %s"
@@ -10284,101 +10496,101 @@ msgstr "Démarrage de %s instances..."
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instance %s: récupérée"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10505,106 +10717,87 @@ msgstr ""
 "Le point de montage %(mountpoint)s à été détaché de l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Appel du getter %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erreur OpenSSL : %s"
@@ -10624,54 +10817,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "Fonction non implémentée"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake n'a pas d'implémentation pour %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10937,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 "
@@ -11102,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 "
@@ -11169,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 ""
 
@@ -11533,32 +11726,32 @@ msgstr "\"Non trouvé\" remonté : %s"
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11576,9 +11769,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 2b662b1aa..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-17 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 "
@@ -81,298 +81,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -380,85 +380,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -466,896 +466,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1370,15 +1391,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1400,17 +1421,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1443,120 +1464,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1570,7 +1601,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1716,261 +1747,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2140,89 +2166,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2270,6 +2314,7 @@ msgstr ""
 #: 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 ""
 
@@ -2316,21 +2361,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2338,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 ""
 
@@ -2362,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 ""
 
@@ -2375,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 ""
 
@@ -2421,9 +2472,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2552,136 +2603,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2722,6 +2777,7 @@ msgstr ""
 #: 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 ""
 
@@ -2761,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 ""
 
@@ -2882,7 +2939,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2922,32 +2980,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2958,40 +3016,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3025,7 +3090,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3073,7 +3138,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3264,30 +3329,36 @@ 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 "
@@ -3299,7 +3370,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3316,16 +3387,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3349,7 +3420,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3408,12 +3479,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3432,106 +3508,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3542,42 +3631,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3589,7 +3678,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3622,35 +3711,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3671,312 +3809,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3990,244 +4128,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4291,12 +4429,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4317,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5067,11 +5225,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5087,15 +5245,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5174,7 +5351,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5196,44 +5373,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5329,47 +5506,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5575,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 ""
@@ -5771,151 +5948,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,12 +6114,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6144,11 +6322,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6198,11 +6386,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6627,86 +6810,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6741,35 +6917,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6793,7 +6969,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6811,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 ""
@@ -6862,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"
@@ -7053,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7225,19 +7421,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7247,25 +7443,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7274,7 +7470,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7296,20 +7492,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7328,37 +7524,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7406,85 +7602,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7569,24 +7765,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7596,7 +7792,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7610,22 +7806,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7738,12 +7930,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7996,12 +8188,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8030,23 +8222,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8059,7 +8251,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8411,12 +8603,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8574,7 +8766,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8613,236 +8805,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8850,76 +9042,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8927,50 +9134,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8980,69 +9187,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9061,15 +9273,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9260,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9308,7 +9521,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9316,7 +9529,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9324,7 +9537,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9535,7 +9748,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9681,32 +9894,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9721,34 +9934,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9960,11 +10173,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10069,100 +10282,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10283,106 +10496,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10398,54 +10592,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10705,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 "
@@ -10934,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 ""
 
@@ -11289,32 +11483,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11332,9 +11526,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 90e7a9332..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-17 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 "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 f60e7cf98..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-17 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 "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 ff6f33136..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-17 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"
@@ -80,300 +80,300 @@ msgstr "Impossibile riavviare l'istanza"
 msgid "Flags path: %s"
 msgstr "Percorso dei flags: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Parametri inaccettabili."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "La richiesta non è valida."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "E' stato ricevuto un input non valido"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Volume non valido"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -381,86 +381,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "E' stato ricevuto un input non valido"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "istanza %s: ripristino"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -468,896 +468,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: 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:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,15 +1393,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Impossibile riavviare l'istanza"
@@ -1403,17 +1424,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1446,120 +1467,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1573,7 +1604,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1719,262 +1750,257 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "istanza %s: ripristino"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2145,89 +2171,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2275,6 +2319,7 @@ msgstr ""
 #: 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 ""
 
@@ -2321,21 +2366,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2343,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 ""
 
@@ -2367,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 ""
 
@@ -2380,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 ""
 
@@ -2426,9 +2477,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2557,139 +2608,143 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Volume non valido"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2730,6 +2785,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 ""
 
@@ -2769,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 ""
 
@@ -2892,7 +2949,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2934,32 +2992,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2970,40 +3028,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3038,7 +3103,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3086,7 +3151,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3277,30 +3342,36 @@ 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 "
@@ -3312,7 +3383,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3329,16 +3400,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3364,7 +3435,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3423,12 +3494,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3447,107 +3523,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: 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:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3558,42 +3647,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3605,7 +3694,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3638,35 +3727,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3687,316 +3825,316 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "ricevuto %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "istanza %s: ripristino"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4010,248 +4148,248 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: 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:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: 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:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4316,12 +4454,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4342,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5104,11 +5262,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5124,15 +5282,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5214,7 +5391,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5237,44 +5414,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5370,47 +5547,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5617,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 ""
@@ -5814,152 +5991,153 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5980,12 +6158,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6189,11 +6367,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6243,11 +6431,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6677,86 +6860,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6791,35 +6967,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6843,7 +7019,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6861,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 ""
@@ -6912,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"
@@ -7103,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7275,19 +7471,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7297,25 +7493,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7324,7 +7520,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7347,20 +7543,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7379,37 +7575,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7462,85 +7658,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Impossibile riavviare l'istanza"
@@ -7625,24 +7821,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7652,7 +7848,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7666,22 +7862,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7794,12 +7986,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8054,12 +8246,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Impossibile localizzare il volume %s"
@@ -8088,23 +8280,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8117,7 +8309,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: 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 +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:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8643,7 +8835,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8682,240 +8874,240 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8923,76 +9115,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9000,50 +9207,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9053,69 +9260,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9134,15 +9346,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9333,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9381,7 +9594,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9389,7 +9602,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9397,7 +9610,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9610,7 +9823,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9756,32 +9969,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9796,34 +10009,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10035,11 +10248,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10144,101 +10357,101 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "istanza %s: ripristino"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10361,106 +10574,87 @@ msgstr "Impossibile smontare il volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s smontato dall'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10476,54 +10670,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "Sollevando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Dichiarando la coda %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10783,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 "
@@ -11013,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 ""
 
@@ -11372,32 +11566,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11415,9 +11609,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 f27d2af83..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-17 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) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 c317aa9fc..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-17 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"
@@ -80,301 +80,301 @@ msgstr "インスタンス終了処理を開始します。"
 msgid "Flags path: %s"
 msgstr "Flags のパス: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Invalid signature: ユーザ %s の署名が不正です。"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -382,86 +382,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "インスタンス %s: rescued"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -469,897 +469,918 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "インスタンス %(instance_name)s にマウントポイント %(mountpoint)s を接続(attach)しました"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "インスタンス %(instance_name)s: インスタンスファイル群 %(target)s を削除しています"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "ボリュームグループ%sが存在しません。"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s を停止しようとしています"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "%s を停止しようとしています"
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1374,15 +1395,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
@@ -1405,17 +1426,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1448,120 +1469,130 @@ 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:436
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "VBD %s から SRを取得できません。"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "VBD %s から SRを取得できません。"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "VBD %s から SRを取得できません。"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "__call__ を実装しなければなりません"
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1575,7 +1606,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1722,265 +1753,260 @@ msgstr "未知のエラーが発生しました。再度リクエストを実行
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "未サポートの API リクエスト: コントローラ = %(controller)s, アクション = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair: キーペア %s を作成します。"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair: キーペア %s を削除します。"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "有効なルールを作成する為の十分なパラメータがありません"
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "指定されたルールは既にグループ %s に存在しています。"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume: %s GBのボリュームを作成します。"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s のデバイス %(device)s に接続"
 
-#: nova/api/ec2/cloud.py:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "アトリビュート %s はサポートされていません。"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Allocate address: アドレスを割り当てます。"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Release address: アドレス %s を開放します。"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image: イメージ %s を登録解除します。"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "イメージ %(image_location)s が ID %(image_id)s で登録されました"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "ユーザまたはグループが指定されていません。"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "グループ  \"all\" のみサポートされています。"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type は add または remove の何れかである必要があります。"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "イメージ %s の公開設定を更新します。"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "インスタンス %s: rescued"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2150,89 +2176,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2280,6 +2324,7 @@ msgstr ""
 #: 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 ""
 
@@ -2326,21 +2371,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2348,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 ""
 
@@ -2372,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 ""
 
@@ -2385,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 ""
 
@@ -2432,9 +2483,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2563,141 +2614,145 @@ msgstr ""
 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:1081
+#: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "マウントポイントを変換できません。 %s"
 
 #: nova/api/openstack/compute/servers.py:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "マウントポイントを変換できません。 %s"
 
 #: nova/api/openstack/compute/servers.py:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "インスタンス %s: rescued"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "インスタンス終了処理を開始します。"
 
 #: nova/api/openstack/compute/servers.py:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2738,6 +2793,7 @@ msgstr "例外: Compute.api::reset_network %s"
 #: 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 ""
 
@@ -2777,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 ""
 
@@ -2901,7 +2958,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2943,33 +3001,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp が実行されていません…"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2980,40 +3038,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, 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 ""
 
@@ -3048,7 +3113,7 @@ msgstr "グループ %s は既に存在しています。"
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3097,7 +3162,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3291,30 +3356,36 @@ 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 "
@@ -3326,7 +3397,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "有効なルールを作成する為の十分なパラメータがありません"
 
@@ -3344,16 +3415,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3379,7 +3450,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3438,12 +3509,17 @@ msgstr "例外 %s が発生しました。"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Release address: アドレス %s を開放します。"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Release address: アドレス %s を開放します。"
@@ -3462,107 +3538,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3573,42 +3662,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3620,7 +3709,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3653,35 +3742,84 @@ msgstr "%s 用のVPNを起動します。"
 msgid "Failed to load %s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3702,320 +3840,320 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "受信： %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "開始アドレス"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "開始アドレス"
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "予期しないエラー発生: %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "インスタンス %s: rescued"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4029,253 +4167,253 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "インスタンス %s にボリュームを接続(attach)できません。"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作成します。"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4340,12 +4478,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4366,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキューします。"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s の診断情報を取得します。"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "コンソールを追加しています"
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "コンソールを追加しています"
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "ボリュームを未知のインスタンス %s からデタッチします。"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5137,11 +5295,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5157,15 +5315,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 "コンソールを追加しています"
@@ -5245,7 +5422,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5267,44 +5444,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: 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:883
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: 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:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "インスタンス %s: rescued"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5400,47 +5577,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "初期化ベクタの復号に失敗しました: %s"
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "イメージファイル %(image_file)s の復号に失敗しました: %(err)s"
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5647,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"
@@ -5844,155 +6021,156 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6013,12 +6191,12 @@ msgstr "xvp の開始中にエラー: %s"
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6222,11 +6400,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6276,11 +6464,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6710,86 +6893,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6824,35 +7000,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6876,7 +7052,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6894,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 ""
@@ -6945,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"
@@ -7136,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "インスタンス %s は実行中です。"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "インスタンス %s を終了した後です。"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7309,19 +7505,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7331,25 +7527,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7358,7 +7554,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7380,20 +7576,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7412,37 +7608,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7495,85 +7691,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
@@ -7658,24 +7854,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7685,7 +7881,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7699,22 +7895,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7827,12 +8019,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8086,12 +8278,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "ファイルシステム %s のマウントに失敗しました。"
@@ -8120,23 +8312,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
@@ -8150,7 +8342,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8506,12 +8698,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: 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' を埋め込んでいます"
@@ -8677,7 +8869,7 @@ msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "raw instanceを生成します。"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8716,238 +8908,238 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "ボリュームグループ%sが存在しません。"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "libvirtへの接続が切れています。"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "%s を停止しようとしています"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: 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:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8955,76 +9147,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9032,50 +9239,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9085,69 +9292,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "%s の認証に失敗しました。"
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9166,15 +9378,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9365,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9413,7 +9626,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9421,7 +9634,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9429,7 +9642,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9641,7 +9854,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9787,32 +10000,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9827,34 +10040,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10068,12 +10281,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "ネストした戻り値: %s"
@@ -10181,101 +10394,101 @@ msgstr "%s 個のインスタンスの起動を始めます…"
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "インスタンス %s: rescued"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10398,106 +10611,87 @@ msgstr "ボリューム %s を切断(detach)できません"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s からマウントポイント %(mountpoint)s を切断(detach)しました"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "getter %s をコールします。"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL エラー: %s"
@@ -10516,54 +10710,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s が発生しました。"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "NotImplemented 例外を発生させます。"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake には %s が実装されていません。"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10826,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 "
@@ -11057,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 ""
 
@@ -11420,32 +11614,32 @@ msgstr "NotFound 発生: %s"
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11463,9 +11657,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 18143b317..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-17 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) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 cde76912a..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-17 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"
@@ -79,299 +79,299 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr "플래그 경로: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 장착되었습니다"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,137 +2602,141 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2722,6 +2777,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 ""
 
@@ -2761,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 ""
 
@@ -2883,7 +2940,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2925,32 +2983,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2961,40 +3019,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3029,7 +3094,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3077,7 +3142,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3268,30 +3333,36 @@ 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 "
@@ -3303,7 +3374,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3320,16 +3391,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3353,7 +3424,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3412,12 +3483,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3436,107 +3512,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 장착되었습니다"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3547,42 +3636,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3594,7 +3683,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3627,35 +3716,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3676,313 +3814,313 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3996,245 +4134,245 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4298,12 +4436,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4324,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5082,11 +5240,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5102,15 +5260,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5189,7 +5366,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5211,44 +5388,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5344,47 +5521,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5590,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 ""
@@ -5786,151 +5963,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5951,12 +6129,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6159,11 +6337,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6213,11 +6401,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6642,86 +6825,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 장착되었습니다"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6756,35 +6932,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6808,7 +6984,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6826,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 ""
@@ -6877,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"
@@ -7068,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7240,19 +7436,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7262,25 +7458,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7289,7 +7485,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7311,20 +7507,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7343,37 +7539,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7426,85 +7622,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7589,24 +7785,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7616,7 +7812,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7630,22 +7826,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7758,12 +7950,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8017,12 +8209,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "%s 볼륨을 찾을수 없습니다"
@@ -8051,23 +8243,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8080,7 +8272,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8434,12 +8626,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8604,7 +8796,7 @@ msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8643,236 +8835,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8880,76 +9072,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8957,50 +9164,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9010,69 +9217,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9091,15 +9303,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9290,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9338,7 +9551,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9346,7 +9559,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9354,7 +9567,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9566,7 +9779,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9712,32 +9925,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9752,34 +9965,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9991,11 +10204,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10100,100 +10313,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10316,106 +10529,87 @@ msgstr "%s 볼륨 탈착에 실패했습니다"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 탈착되었습니다"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10431,54 +10625,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10738,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 "
@@ -10967,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 ""
 
@@ -11324,32 +11518,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11367,9 +11561,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 1e1c36398..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-17 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"
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "가상 인터페이스 생성 실패"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "인증되지 않음."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Keypair 데이터가 맞지 않습니다"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "그 요청은 맞지 않습니다."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "입력 값이 정확하지 않습니다."
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "인스턴스 잠자기 실패"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "인스턴스 재시작 실패"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "CPU 정보를 받을수 없습니다."
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s는 v4/6주소에 맞지 않은 IP입니다."
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Disk format %(disk_format)s를 알 수 없습니다."
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "주소 할당"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "주소 릴리즈 %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,137 +2602,141 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "입력 값이 정확하지 않습니다."
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2722,6 +2777,7 @@ msgstr ""
 #: 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 ""
 
@@ -2761,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 ""
 
@@ -2882,7 +2939,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2922,32 +2980,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2958,40 +3016,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3025,7 +3090,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3073,7 +3138,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3264,30 +3329,36 @@ 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 "
@@ -3299,7 +3370,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3316,16 +3387,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3349,7 +3420,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3408,12 +3479,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "주소 릴리즈 %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "주소 릴리즈 %s"
@@ -3432,107 +3508,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "인스턴스 재시작 실패"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3543,42 +3632,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3590,7 +3679,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3623,35 +3712,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3672,312 +3810,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3991,244 +4129,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4292,12 +4430,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4318,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5068,11 +5226,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5088,15 +5246,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5175,7 +5352,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5197,44 +5374,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5330,47 +5507,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5576,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 ""
@@ -5772,151 +5949,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5937,12 +6115,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6145,11 +6323,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6199,11 +6387,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6628,86 +6811,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6742,35 +6918,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6794,7 +6970,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6812,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 ""
@@ -6863,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"
@@ -7054,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7226,19 +7422,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7248,25 +7444,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7275,7 +7471,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7297,20 +7493,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7329,37 +7525,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7407,85 +7603,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7570,24 +7766,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7597,7 +7793,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7611,22 +7807,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7739,12 +7931,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7997,12 +8189,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8031,23 +8223,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8060,7 +8252,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8412,12 +8604,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8575,7 +8767,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8614,236 +8806,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8851,76 +9043,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8928,50 +9135,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8981,69 +9188,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9062,15 +9274,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9261,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9309,7 +9522,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9317,7 +9530,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9325,7 +9538,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9536,7 +9749,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9682,32 +9895,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9722,34 +9935,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9961,11 +10174,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10070,100 +10283,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10284,106 +10497,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10399,54 +10593,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10706,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 "
@@ -10935,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 ""
 
@@ -11291,32 +11485,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11334,9 +11528,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 6a0d7730e..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-17 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 "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 998e5e734..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-17 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"
@@ -81,298 +81,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "En ukjent feil oppsto."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Kunne ikke dekryptere teksten"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Kunne ikke dekryptere teksten"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Ikke autorisert."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Bruker har ikke admin-rettigheter"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "Forespørselen er ugyldig."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Ugyldig IP protokoll %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s er ikke en gyldig IP v4/6 addresse."
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -380,85 +380,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Ressurs ble ikke funnet."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -466,896 +466,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Nettverk %(network_id)s ble ikke funnet."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Nettverk %(network_id)s ble ikke funnet."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Ingen nettverk definert."
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "Handlingen er ikke tillatt."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "Nøkkelpar '%s' finnes allerede."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Kvote overskredet"
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1370,15 +1391,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1400,17 +1421,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1443,120 +1464,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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 "Forventet objekt av typen: %s"
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: 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:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Kan ikke finne adressen %r"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Kan ikke finne adressen %r"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Kan ikke finne adressen %r"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr "Stoppet WSGI tjener."
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr "WSGI tjener har stoppet."
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "Du må implementere __call__"
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1570,7 +1601,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1716,261 +1747,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Lag nøkkelpar %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "Importer nøkkel %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Slett nøkkelpar %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Ugyldig IP protokoll %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Ingen regel for de angitte parametrene."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Tildel adresse"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Frigjør adresse %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "bruker eller gruppe ikke spesifisert"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "kun gruppe \"all\" er støttet"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2141,89 +2167,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Laster utvidelse %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Kunne ikke laste utvidelse %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Kunne ikke laste utvidelse %(classpath)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Kunne ikke laste utvidelse %(ext_name)s: %(exc)s"
 
+#: 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 ""
@@ -2271,6 +2315,7 @@ msgstr "Ingen slik handling: %s"
 #: 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 ""
 
@@ -2317,21 +2362,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2339,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 ""
 
@@ -2363,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 ""
 
@@ -2376,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 ""
 
@@ -2422,9 +2473,9 @@ msgstr "Tjeneste %(service_id)s ble ikke funnet."
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2553,139 +2604,143 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Ugyldig snapshot"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2726,6 +2781,7 @@ msgstr ""
 #: 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 "Tjener ikke funnet"
 
@@ -2765,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 ""
 
@@ -2886,7 +2943,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2926,33 +2984,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Ugyldig snapshot"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Nøkkelpar '%s' finnes allerede."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2963,40 +3021,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3031,7 +3096,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3079,7 +3144,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3272,30 +3337,36 @@ msgid "Create networks failed"
 msgstr "Ingen nettverk definert."
 
 #: 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 "
@@ -3307,7 +3378,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Ikke nok parametere for å lage en gyldig regel."
 
@@ -3325,16 +3396,16 @@ msgstr "Viser nettverk med id %s"
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Sletter nettverk med id %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3358,7 +3429,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3417,12 +3488,17 @@ msgstr "Laster utvidelse %s"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Frigjør adresse %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Frigjør adresse %s"
@@ -3441,106 +3517,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3551,42 +3640,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3598,7 +3687,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3631,35 +3720,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Kan ikke finne adressen %r"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3680,314 +3818,314 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "Tildel adresse"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "Nettverk ikke funnet"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4001,244 +4139,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4302,12 +4440,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4328,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5078,11 +5236,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5098,15 +5256,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5185,7 +5362,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5207,44 +5384,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5340,47 +5517,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5586,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 ""
@@ -5783,152 +5960,153 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "Nettverk ikke funnet"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5949,12 +6127,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6157,11 +6335,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6211,11 +6399,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6641,86 +6824,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6755,35 +6931,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6807,7 +6983,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6825,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 ""
@@ -6876,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"
@@ -7068,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7241,19 +7437,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7263,25 +7459,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7290,7 +7486,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7312,20 +7508,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7344,37 +7540,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7423,85 +7619,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7587,24 +7783,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7614,7 +7810,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7628,22 +7824,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "Metadata element ble ikke funnet"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7756,12 +7948,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8014,12 +8206,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Kan ikke finne adressen %r"
@@ -8048,23 +8240,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8077,7 +8269,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8429,12 +8621,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8592,7 +8784,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8631,238 +8823,238 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Ingen nettverk definert."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Ingen nettverk definert."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8870,76 +9062,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8947,50 +9154,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9000,69 +9207,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9081,15 +9293,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9280,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9328,7 +9541,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9336,7 +9549,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9344,7 +9557,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9555,7 +9768,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9701,32 +9914,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9741,34 +9954,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9980,11 +10193,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10089,100 +10302,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10305,106 +10518,87 @@ msgstr "Kan ikke finne adressen %r"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10420,54 +10614,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10728,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 "
@@ -10957,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 ""
 
@@ -11313,32 +11507,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11356,9 +11550,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 d4aa6ac08..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-17 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) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
 #~ msgstr ""
 
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 9d8f7c49f..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.280\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.291\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-17 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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1419,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1441,120 +1462,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+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:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1568,7 +1599,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1714,261 +1745,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2138,89 +2164,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2268,6 +2312,7 @@ msgstr ""
 #: 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 ""
 
@@ -2314,21 +2359,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2336,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 ""
 
@@ -2360,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 ""
 
@@ -2373,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 ""
 
@@ -2419,9 +2470,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2550,136 +2601,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2720,6 +2775,7 @@ msgstr ""
 #: 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 ""
 
@@ -2759,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 ""
 
@@ -2880,7 +2937,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2920,32 +2978,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2956,40 +3014,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3023,7 +3088,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3071,7 +3136,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3262,30 +3327,36 @@ 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 "
@@ -3297,7 +3368,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3314,16 +3385,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3347,7 +3418,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3406,12 +3477,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3430,106 +3506,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3540,42 +3629,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3587,7 +3676,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3620,35 +3709,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3669,312 +3807,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3988,244 +4126,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4289,12 +4427,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5065,11 +5223,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5085,15 +5243,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5172,7 +5349,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5194,44 +5371,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5327,47 +5504,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5573,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 ""
@@ -5769,151 +5946,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5934,12 +6112,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6142,11 +6320,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6196,11 +6384,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6625,86 +6808,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6739,35 +6915,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6791,7 +6967,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6809,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 ""
@@ -6860,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"
@@ -7051,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7223,19 +7419,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7245,25 +7441,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7272,7 +7468,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7294,20 +7490,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7326,37 +7522,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7404,85 +7600,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7567,24 +7763,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7594,7 +7790,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7608,22 +7804,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7736,12 +7928,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7994,12 +8186,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8028,23 +8220,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8057,7 +8249,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8409,12 +8601,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8572,7 +8764,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8611,236 +8803,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8848,76 +9040,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8925,50 +9132,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8978,69 +9185,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9059,15 +9271,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9258,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9306,7 +9519,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9314,7 +9527,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9322,7 +9535,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9533,7 +9746,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9679,32 +9892,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9719,34 +9932,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9958,11 +10171,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10067,100 +10280,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10281,106 +10494,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10396,54 +10590,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10703,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 "
@@ -10932,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 ""
 
@@ -11287,32 +11481,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 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 c3824cc52..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-17 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 "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 84f7fa2b0..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-17 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"
@@ -80,301 +80,301 @@ msgstr "Falhou ao reiniciar instância"
 msgid "Flags path: %s"
 msgstr "Localização dos sinalizadores: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Falhou ao descriptografar texto"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Falhou ao descriptografar texto"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Não autorizado."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Parâmetros inaceitáveis."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "A requisição é inválida."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Dados recebidos é inválido"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Volume inválido"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Assinatura inválida para usuário %s"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Sequencia de porta %(from_port)s:%(to_port)s é inválida. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP %(protocol)s é inválido."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Tipo de conteúdo %(content_type)s é inválido."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Falhou em atualizar senha: %(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Falha ao suspender instância"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Serviço está indisponível neste momento"
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Serviço está indisponível neste momento"
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s não é um endereço IPv4/6 válido."
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -382,86 +382,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato do disco %(disk_format)s não é aceito"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Dados recebidos é inválido"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "Instância não existe"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -469,897 +469,918 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s é necessário para criar a rede."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Nenhuma rede definida."
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Ponto de montagem %(mountpoint)s conectada à instância %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Removendo rede com id %s"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s não encontrada."
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr "Certificado %(certificate_id)s não encontrado."
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Usuário %(user_id)s não foi encontrado."
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:798
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Tipo de conteúdo %(content_type)s é inválido."
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "Instância não existe"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: 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:1140
+#: 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:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: 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:1177
+#: 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:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1374,15 +1395,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Falha ao obter metadados para o ip: %s"
@@ -1405,17 +1426,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1448,120 +1469,130 @@ 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:436
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1575,7 +1606,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1722,265 +1753,260 @@ msgstr "Ocorreu um erro desconhecido. Por favor tente sua requisição novamente
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Criar par de chaves %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Remover par de chaves %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Protocolo IP %(protocol)s é inválido."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Não existe regra para os parâmetros especificados"
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regra já existe no grupo %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Criar volume de %s GB"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "atributo não suportado: %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Alocar endereço"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar endereço %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "usuário ou grupo não especificado"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "apenas o grupo \"all\" é suportado"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type deve ser add ou remove"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Atualizando publicidade da imagem %s"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "Instância não existe"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2151,89 +2177,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2281,6 +2325,7 @@ msgstr ""
 #: 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 "Corpo do pedido está mal formado"
 
@@ -2327,21 +2372,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2349,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."
 
@@ -2373,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 ""
 
@@ -2386,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."
 
@@ -2433,9 +2484,9 @@ msgstr "Host %(host)s não encontrado."
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2564,142 +2615,146 @@ msgstr ""
 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:1081
+#: 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:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: 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:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: 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:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2740,6 +2795,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 ""
 
@@ -2779,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"
 
@@ -2903,7 +2960,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2945,32 +3003,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Rede já existe!"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2981,41 +3039,48 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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"
@@ -3051,7 +3116,7 @@ msgstr "group %s já existe"
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3100,7 +3165,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3296,30 +3361,36 @@ msgid "Create networks failed"
 msgstr "Nenhuma rede definida."
 
 #: 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 "
@@ -3331,7 +3402,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3349,16 +3420,16 @@ msgstr "Mostrando rede com id %s"
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Removendo rede com id %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3384,7 +3455,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3443,12 +3514,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Liberar endereço %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Liberar endereço %s"
@@ -3467,107 +3543,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: 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:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3578,42 +3667,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3625,7 +3714,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3658,35 +3747,84 @@ msgstr "Executando VPN para %s"
 msgid "Failed to load %s"
 msgstr "Não foi possível criar volume"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3707,321 +3845,321 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "recebido %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "instância %s: reset da rede"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "Alocar endereço"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "group %s já existe"
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "Nenhuma rede definida."
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s é necessário para criar a rede."
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "Reiniciar instância %r"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "Instância não existe"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "_criar: %s"
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4035,252 +4173,252 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: 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:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: 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:1335
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: 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:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: 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:3029
+#: 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:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: 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:3145
+#: 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:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4345,12 +4483,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4371,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: 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:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Removendo rede com id %s"
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desanexar volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Iniciando instância %s"
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instância não existe"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Remover volume com id: %s"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instância %s não encontrada"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Iniciando instância %s"
@@ -5141,11 +5299,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5161,15 +5319,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 "Adicionando console"
@@ -5250,7 +5427,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5273,44 +5450,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: 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:883
+#: 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:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: 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:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "Corpo do pedido está mal formado"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5406,47 +5583,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr "Removendo imagem %s"
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5653,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"
@@ -5850,155 +6027,156 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "Imagem não encontrada."
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Removendo rede com id %s"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Capturado o erro: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6019,12 +6197,12 @@ msgstr "Configurar senha do administrador"
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6228,11 +6406,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6282,11 +6470,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6717,86 +6900,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Iniciando instância %s"
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6831,35 +7007,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6883,7 +7059,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6901,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 ""
@@ -6952,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"
@@ -7143,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7316,19 +7512,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7338,25 +7534,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Não foi possível carregar o driver de virtualização: %s"
@@ -7366,7 +7562,7 @@ msgstr "Não foi possível carregar o driver de virtualização: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7389,20 +7585,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7421,37 +7617,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7505,85 +7701,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
@@ -7669,24 +7865,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7696,7 +7892,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7710,22 +7906,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "nenhuma partição encontrada"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "nenhuma partição encontrada"
@@ -7838,12 +8030,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8098,12 +8290,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Falhou em montar sistema de arquivo: %s"
@@ -8132,23 +8324,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Obter saída do console para instância %s"
@@ -8162,7 +8354,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8518,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:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8689,7 +8881,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8728,244 +8920,244 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Nenhuma rede definida."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Nenhuma rede definida."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8973,76 +9165,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9050,50 +9257,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9103,69 +9310,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Falha de Autenticação: %s"
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: 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 %(path)s since it looks like volume"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3609
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9184,15 +9396,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9383,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9431,7 +9644,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9439,7 +9652,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9447,7 +9660,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9660,7 +9873,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9806,32 +10019,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "nenhuma partição encontrada"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9846,34 +10059,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "Sessão inválida"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10086,12 +10299,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10198,101 +10411,101 @@ msgstr "Começando a terminar instâncias"
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Atualizando agente para %s"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Remover volume com id: %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "Instância não existe"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Remover volume com id: %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10415,106 +10628,87 @@ msgstr "Não foi possível criar volume"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s desanexada da instância %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Atualizando agente para %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erro de OpenSSL: %s"
@@ -10530,54 +10724,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "Aumento não implementado"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake não tem uma implementação para %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10843,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 "
@@ -11073,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 ""
 
@@ -11432,32 +11626,32 @@ msgstr "NotFound lançado: %s"
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11475,9 +11669,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 f907b82e0..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-17 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 "
@@ -81,298 +81,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -380,85 +380,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -466,896 +466,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1370,15 +1391,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1400,17 +1421,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1443,120 +1464,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1570,7 +1601,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1716,261 +1747,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2140,89 +2166,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2270,6 +2314,7 @@ msgstr ""
 #: 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 ""
 
@@ -2316,21 +2361,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2338,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 ""
 
@@ -2362,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 ""
 
@@ -2375,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 ""
 
@@ -2421,9 +2472,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2552,136 +2603,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2722,6 +2777,7 @@ msgstr ""
 #: 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 ""
 
@@ -2761,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 ""
 
@@ -2882,7 +2939,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2922,32 +2980,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2958,40 +3016,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3025,7 +3090,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3073,7 +3138,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3264,30 +3329,36 @@ 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 "
@@ -3299,7 +3370,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3316,16 +3387,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3349,7 +3420,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3408,12 +3479,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3432,106 +3508,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3542,42 +3631,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3589,7 +3678,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3622,35 +3711,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3671,312 +3809,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3990,244 +4128,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4291,12 +4429,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4317,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5067,11 +5225,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5087,15 +5245,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5174,7 +5351,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5196,44 +5373,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5329,47 +5506,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5575,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 ""
@@ -5771,151 +5948,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,12 +6114,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6144,11 +6322,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6198,11 +6386,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6627,86 +6810,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6741,35 +6917,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6793,7 +6969,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6811,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 ""
@@ -6862,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"
@@ -7053,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7225,19 +7421,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7247,25 +7443,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7274,7 +7470,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7296,20 +7492,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7328,37 +7524,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7406,85 +7602,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7569,24 +7765,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7596,7 +7792,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7610,22 +7806,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7738,12 +7930,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7996,12 +8188,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8030,23 +8222,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8059,7 +8251,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8411,12 +8603,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8574,7 +8766,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8613,236 +8805,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8850,76 +9042,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8927,50 +9134,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8980,69 +9187,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9061,15 +9273,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9260,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9308,7 +9521,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9316,7 +9529,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9324,7 +9537,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9535,7 +9748,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9681,32 +9894,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9721,34 +9934,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9960,11 +10173,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10069,100 +10282,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10283,106 +10496,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10398,54 +10592,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10705,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 "
@@ -10934,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 ""
 
@@ -11289,32 +11483,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11332,9 +11526,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 de31cceb9..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-17 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"
@@ -84,180 +84,180 @@ msgstr "Ошибка перезагрузки копии"
 msgid "Flags path: %s"
 msgstr "Расположение флагов: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Обнаружено неизвестное исключение."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Ошибка дешифровки текста"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Ошибка дешифровки текста"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Ошибка создания виртуального интерфейса"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "5 безуспешных попыток создания виртуального интерфейса с уникальным "
 "mac-адресом"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Не авторизировано."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Пользователь не имеет административных привилегий"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Политика не допускает выполнения %(action)s."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Ядро не найдено для образа %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Недопустимые параметры."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 #, fuzzy
 msgid "Block Device Mapping is Invalid."
 msgstr "block_device_mapping %s"
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Том %(volume_id)s никуда не присоединён"
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "Недопустимый запрос."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Недопустимый том"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "Недопустимые метаданные"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Неправильный ключ метаданных"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Недопустимый диапазон портов %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Недопустимый протокол IP %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Недопустимый тип содержимого %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Недопустимый cidr %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -266,86 +266,86 @@ msgstr ""
 "Копия %(instance_uuid)s в %(attr)s %(state)s. Невозможно %(method)s во "
 "время нахождения копии в этом состоянии."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Копия %(instance_id)s не выполняется."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Копия %(instance_id)s не переведена в режим приостановления."
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Ошибка приостановления копии"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Ошибка обновления пароля: %(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "В данный момент служба недоступна."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Служба Compute недоступна в настоящее время."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "Невозможно переместить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Копии необходима новая версия гипервизора, вместо предоставленной."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -354,38 +354,38 @@ msgstr ""
 "Предоставленный адрес диска (%(path)s) уже существует, но ожидалось, что "
 "отсутствует."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Недопустимые сведения ЦПУ"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s не является допустимым IP-адресом в4/6."
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -393,86 +393,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Форматирование диска %(disk_format)s недопустимо"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Образ %(image_id)s недопустим: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Копия %(instance_id)s недопустима: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s недопустим."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Недопустимый cidr %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "копия - %s не представлена"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Ресурс не может быть найден."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Отсутствует диск в %(location)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Невозможно найти обработчик для тома %(driver_type)s."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Недопустимый образ href %(image_href)s."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -480,65 +480,65 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "Невозможно найти SR для чтения/записи VDI."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s необходимо для создания сети."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Сеть не может быть найдена для моста %(bridge)s"
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Сеть не может быть найдена для uuid %(uuid)s"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Сеть не найдена с cidr %(cidr)s."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Сеть не найдена для копии %(instance_id)s."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Сети не определены."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -547,238 +547,234 @@ msgstr ""
 "Или uuid %(network_uuid)s сети не предоставлено или не присвоено проекту "
 "%(project_id)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Сеть не найдена для копии %(instance_id)s."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "Сеть не найдена для копии %(instance_id)s."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "Присвоить адрес %(public_ip)s копии %(instance_id)s"
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Недопустимый фиксированный IP-адрес %(address)s."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Тип тома %(name)s уже существует."
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "Запись DNS %(name)s уже существует в домене %(domain)s."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "установка сетевого узла"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Интерфейс %(interface)s не найден."
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr "Сертификат %(certificate_id)s не найден."
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Узел %(host)s не найден."
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Узел сompute %(host)s не найден."
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Квота не найдена"
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Пользователь %(user_id)s не найден."
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Расширенный ресурс: %s"
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Группа безопасности %(security_group_id)s не найдена."
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Группа безопасности %(security_group_id)s не найдена для проекта "
 "%(project_id)s."
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/exception.py:747
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -787,7 +783,7 @@ msgstr ""
 "Группа безопасности %(security_group_id)s уже ассоциирована с копией "
 "%(instance_id)s"
 
-#: nova/exception.py:752
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -796,598 +792,623 @@ msgstr ""
 "Группа безопасности %(security_group_id)s не ассоциирована с копией "
 "%(instance_id)s"
 
-#: nova/exception.py:757
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Перемещение %(migration_id)s не найдено."
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Перемещение не найдено для копии %(instance_id)s в состоянии %(status)s."
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Пул консоли %(pool_id)s не найден."
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Консоль %(console_id)s не найдена."
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Консоль для копии %(instance_id)s не найдена."
 
-#: nova/exception.py:798
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "Консоль для копии %(instance_id)s в пуле %(pool_id)s не найдена."
 
-#: nova/exception.py:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Недопустимый тип консоли %(console_type)s "
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Тип копии с названием %(instance_type_name)s не найден."
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "том группы %s не существует"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Копия %(instance_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "Копия %(instance_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Файл %(file_path)s не может быть найден."
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "Не найден виртуальный переключатель ассоциированный с сетевым адаптером "
 "%(adapter)s."
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Сетевой адаптер %(adapter)s не может быть найден."
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "Действие не разрешено."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "Копия %(name)s уже существует."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Копия %(name)s уже существует."
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "Ошибка перемещения"
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "Ошибка перемещения"
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Неправильное тело сообщения: %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "При изменении размера, копии должны изменить размер!"
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Недостаточно памяти на узле сети compute для запуска %(uuid)s."
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Превышена квота"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Копия %(instance_id)s не найдена."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Консоль для копии %(instance_id)s не найдена."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Выполнение запуска копий"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Выполнение запуска копий"
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: 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:1177
+#: 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:1181
+#: nova/exception.py:1187
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:1213
+#: 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:1218
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Ожидался объект типа: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1402,15 +1423,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Ошибка получения метаданных для ip: %s"
@@ -1433,17 +1454,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1476,120 +1497,130 @@ 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:436
-#, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr ""
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Ожидался объект типа: %s"
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Недопустимая server_string: %s"
 
-#: nova/utils.py:724
+#: 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:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, fuzzy, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr "Выполняется %(name)s на %(host)s:%(port)s"
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "Невозможно найти адрес %r"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Невозможно найти адрес %r"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "Невозможно найти адрес %r"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr "Выполняется останов сервера WSGI."
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr "Сервер WSGI был остановлен."
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1603,7 +1634,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1756,270 +1787,265 @@ msgstr ""
 "Неподдерживаемый запрос API: контроллер = %(controller)s, действие = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Создать снимок тома %s"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Создание пары ключей %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "Импортировать ключ %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Удаление пары ключей %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Недостаточно параметров для сбора правильного правила."
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Недопустимый протокол IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Это правило уже существует в группе %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Создать том из снимка %s"
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Ошибка создания"
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Подключить том %(volume_id)s для копии %(instance_id)s на %(device)s"
 
-#: nova/api/ec2/cloud.py:898
+#: nova/api/ec2/cloud.py:895
 #, fuzzy
 msgid "Attach Failed."
 msgstr "Ошибка создания"
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "аттрибут не поддерживается: %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Выделить адрес"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Присвоить адрес %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "Невозможно найти адрес %r"
 
-#: nova/api/ec2/cloud.py:1261
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Присвоить адрес %(public_ip)s копии %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Невозможно найти адрес %r"
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Невозможно найти адрес %r"
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Исключить адрес %s"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Образ должен быть доступен"
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Перезагрузить копию %r"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "Выполнение остановки копий"
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "Выполнение запуска копий"
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Исключение регистрации образа %s"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Зарегистрированный образ %(image_location)s с идентификатором %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "не указан пользователь или группа"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "поддерживается только группа \"все(all)\""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Обновление осведомлённости об образе %s"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Невозможно остановить копию в течении %d с."
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Перечень копий"
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "копия - %s не представлена"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Перечень копий"
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Недопустимый cidr %(cidr)s."
@@ -2195,89 +2221,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr "Недопустимые метаданные"
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Невозможно '%(action)s', когда копия в %(attr)s %(state)s"
 
 #: 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
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "Копия в недопустимом состоянии для '%(action)s'"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Отклонение запроса снимка, снимки в данный момент отключены"
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Снимки копии в настоящий момент недопустимы."
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Загруженное расширение: %s"
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Загрузка расширения %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Ошибка загрузки расширения %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Ошибка загрузки расширения %(ext_name)s: %(exc)s"
 
+#: 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 ""
@@ -2325,6 +2369,7 @@ msgstr ""
 #: 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 "Неправильное тело запроса"
 
@@ -2371,21 +2416,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2393,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 "образ не найден."
 
@@ -2417,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 ""
 
@@ -2430,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 "
@@ -2439,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 ""
 
@@ -2479,9 +2530,9 @@ msgstr "Узел %(host)s не найден."
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 "Копия не найдена"
 
@@ -2611,143 +2662,147 @@ msgstr "Невозможно найти запрошенный образ"
 msgid "Invalid key_name provided."
 msgstr "Предоставлен недопустимый key_name."
 
+#: 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:1081
+#: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Точка подключения не может быть переведена: %s"
 
 #: nova/api/openstack/compute/servers.py:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "Точка подключения не может быть переведена: %s"
 
 #: nova/api/openstack/compute/servers.py:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1151
+#: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr "Отсутствует аргумент типа 'type' для перезагрузки"
 
 #: nova/api/openstack/compute/servers.py:1091
-#: nova/api/openstack/compute/plugins/v3/servers.py:1173
+#: 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:1176
+#: nova/api/openstack/compute/plugins/v3/servers.py:1173
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Изменение размера требует изменения объёма."
 
 #: nova/api/openstack/compute/servers.py:1100
-#: nova/api/openstack/compute/plugins/v3/servers.py:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "Недопустимый запрос тела"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "Отсутствует атрибут imageRef"
 
 #: nova/api/openstack/compute/servers.py:1138
-#: nova/api/openstack/compute/plugins/v3/servers.py:1220
+#: 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:1253
+#: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "Отсутствует атрибут flavorRef"
 
 #: nova/api/openstack/compute/servers.py:1178
-#: nova/api/openstack/compute/plugins/v3/servers.py:1266
+#: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr "adminPass не был задан"
 
 #: nova/api/openstack/compute/servers.py:1182
 #: nova/api/openstack/compute/servers.py:1391
-#: nova/api/openstack/compute/plugins/v3/servers.py:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1188
-#: nova/api/openstack/compute/plugins/v3/servers.py:1276
+#: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "Ошибка перезагрузки копии"
 
 #: nova/api/openstack/compute/servers.py:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1298
+#: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Запрос изменения размера имеет недопустимый атрибут 'flavorRef'."
 
 #: nova/api/openstack/compute/servers.py:1213
-#: nova/api/openstack/compute/plugins/v3/servers.py:1301
+#: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Запросы изменение размера требуют атрибут 'flavorRef'."
 
 #: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
@@ -2788,6 +2843,7 @@ msgstr ""
 #: 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 "Сервер не найден"
 
@@ -2827,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 "Копия не найдена"
 
@@ -2954,7 +3011,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2996,34 +3054,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp не выполняется..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Недопустимый снимок"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Группа безопасности %s уже существует"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -3034,41 +3092,48 @@ 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
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Ошибка перемещения %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 "Нет тела запроса"
@@ -3104,7 +3169,7 @@ msgstr "Тип тома %(name)s уже существует."
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3155,7 +3220,7 @@ msgstr ""
 "%(instance_id)s"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3353,30 +3418,36 @@ 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 "
@@ -3388,7 +3459,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Недостаточно параметров для сбора правильного правила."
 
@@ -3407,16 +3478,16 @@ msgstr "Отображение сети с идентификатором %s"
 msgid "security group default rule not found"
 msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Недопустимый префикс для to_global_ipv6: %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "Группа безопасности не задана"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "Наименование группы безопасности не может отсутствовать"
 
@@ -3442,7 +3513,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 #, fuzzy
 msgid "Unknown service"
 msgstr "Ошибка аутентификации"
@@ -3502,12 +3573,17 @@ msgstr "Загруженное расширение: %s"
 msgid "Ext version: %i"
 msgstr "Версия агента копии: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Присвоить адрес %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Присвоить адрес %s"
@@ -3526,107 +3602,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3637,42 +3726,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3684,7 +3773,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3717,35 +3806,84 @@ msgstr "Запуск VPN для %s"
 msgid "Failed to load %s"
 msgstr "Невозможно создать том"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "элемент не является потомком"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3768,323 +3906,323 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "получено %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "Восстановление сети"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "Выделить адрес"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "Тип тома %(name)s уже существует."
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "проект"
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "Сеть не найдена"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "%(req)s необходимо для создания сети."
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "Выполнение остановки копий"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "Непредвиденная ошибка: %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 #, fuzzy
 msgid "PROJECT"
 msgstr "проект"
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "копия - %s не представлена"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 #, fuzzy
 msgid "Unknown error"
 msgstr "Ошибка аутентификации"
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "Таблица |%s| не создана!"
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "тип = %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4098,26 +4236,26 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Превышена квота копий. Вы не можете запустить дополнительные копии этого "
 "типа."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Превышена квота копий. Вы можете запустить только %s копий этого типа."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -4126,97 +4264,97 @@ msgstr ""
 "Превышена квота для %(pid)s, попытка назначить %(num_metadata)s свойств "
 "метаданных"
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Невозможно присоединить том для копии %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполняет запуск %s копий..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "Отсутствует узел для копии %s, немедленное удаление"
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Попытка остановить %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Попытка запустить %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr "Поиск по: %s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Запуск снимка для ВМ %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4225,63 +4363,63 @@ msgstr ""
 "Устаревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2103
+#: 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:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Группа безопасности %s не может быть пустой."
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2923
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4290,70 +4428,70 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Длина превышает "
 "максимально допустимое значение 255."
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопасности %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Группа безопасности %s уже существует"
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Невозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Невозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Группа безопасности (%s) не найдена"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Правило (%s) не найдено"
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4418,12 +4556,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4444,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Ошибка приостановления копии"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Непредвиденный код состояния"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "установка сетевого узла"
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: 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:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Создать снимок из тома %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1876
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4706,26 +4864,26 @@ msgstr ""
 "попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
 "%(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "копия не включена"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "копия %s: выполнение снимка"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1961
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4734,229 +4892,229 @@ msgstr ""
 "попытка создания снимка не выполняемой копии: %(instance_uuid)s "
 "(состояние: %(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1973
+#: 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:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 #, fuzzy
 msgid "Root password set"
 msgstr "Копия %s: Назначение административного пароля"
 
-#: nova/compute/manager.py:2028
+#: 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:2043
+#: nova/compute/manager.py:2092
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Ошибка назначения пароля администратора"
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Ошибка приостановления копии"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "%s. Установка состояния копии vm_state на ERROR"
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Копия не существует"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "назначение совпадает с источником!"
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "копия %s: принятие диагностики"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "Восстановление сети"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "установка сетевого узла"
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "копия %s: получение консоли vnc"
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "копия %s: получение консоли vnc"
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Отсоединение тома от неизвестной копии %s"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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."
@@ -4965,21 +5123,21 @@ msgstr ""
 "отсутствует домен с соответствующим именем.\" Эта ошибка может быть "
 "безопасно пропущена."
 
-#: nova/compute/manager.py:3476
+#: nova/compute/manager.py:3525
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Ошибка получения метаданных для ip: %s"
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: nova/compute/manager.py:3738
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4988,64 +5146,64 @@ msgstr ""
 "Найдены %(migration_count)d неподтверждённых перемещений, старше "
 "%(confirm_window)d секунд"
 
-#: nova/compute/manager.py:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: 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:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "Обновление временных данных использования полосы пропускания"
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Обновление временных данных использования полосы пропускания"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "Обновление состояния узла"
 
-#: nova/compute/manager.py:3936
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5054,86 +5212,86 @@ msgstr ""
 "Найдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
 "гипервизоре."
 
-#: nova/compute/manager.py:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "копия не включена"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, пропуск..."
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "%s. Установка состояния копии vm_state на ERROR"
@@ -5235,11 +5393,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "Невозможно найти узел для копии %s"
@@ -5255,16 +5413,35 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:322
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
 
+#: 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 "Добавление консоли"
@@ -5346,7 +5523,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5369,44 +5546,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Нераспознанное значение read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "Недопустимый запрос тела"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5503,47 +5680,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr "Удаление образа %s"
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "Ошибка загрузки %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "Ошибка расшифрования %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "Ошибка извлечения %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "Ошибка выгрузки %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Ошибка дешифрирования вектора инициализации: %s"
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Ошибка дешифрирования файла образа %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr "В образе небезопасные имена файлов"
 
@@ -5752,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"
@@ -5961,158 +6138,158 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-#, fuzzy
-msgid "quantum authentication failed"
-msgstr "Ошибка аутентификации"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, fuzzy, python-format
 msgid "allocate_for_instance() for %s"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "Узел не найден"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, fuzzy, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr "Ошибка удаления тома в базе данных"
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr "Ошибка удаления тома в базе данных"
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, fuzzy, python-format
 msgid "validate_networks() for %s"
 msgstr "Недопустимый сетевой формат"
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "установка сетевого узла"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Обнаружена ошибка: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Группа безопасности (%s) не найдена"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Обнаружена ошибка: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Группа безопасности %(security_group_id)s не найдена для проекта "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6136,12 +6313,12 @@ msgstr "Ошибка назначения пароля администрато�
 msgid "Invalid version string"
 msgstr "Недопустимая server_string: %s"
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6345,11 +6522,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6401,11 +6588,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, fuzzy, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr "Ошибка загрузки расширения %(ext_name)s: %(exc)s"
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6845,86 +7027,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "Выполняется ли соответствующая служба?"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "Невозможно найти другой compute"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "%s. Установка состояния копии vm_state на ERROR"
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "Попытка собрать %(num_instances)d копию(й)"
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "Запрос: %s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "Невозможно переместить копию (%(instance_id)s) на текущий узел (%(host)s)."
@@ -6959,36 +7134,36 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr "Принято служебное обновление для %(service_name)s от %(host)s."
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, fuzzy, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr "Принято служебное обновление для %(service_name)s от %(host)s."
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "Нет службы для compute ID %s"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
-#, 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'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "Невозможно декодировать параметры расписания: '%(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
@@ -7011,7 +7186,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7029,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 ""
@@ -7080,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"
@@ -7272,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 ""
@@ -7280,53 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "Выполняемые копии: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "После завершения работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "После принудительного завершения работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "Ошибка аутентификации"
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7450,19 +7645,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Создание файлов в %s для имитации гостевого агента"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Удаление файлов имитации гостевого агента в %s"
@@ -7472,25 +7667,25 @@ msgstr "Удаление файлов имитации гостевого аге
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Невозможно загрузить драйвер виртуализации: %s"
@@ -7500,7 +7695,7 @@ msgstr "Невозможно загрузить драйвер виртуали�
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7523,20 +7718,20 @@ msgstr "Добавление правила группы безопасност�
 msgid "Adding provider rule: %s"
 msgstr "Добавление правила поставщика: %s"
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr "Ошибка анализа 'qemu-img info'."
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Преобразование в необработанный, но текущий формат %s"
@@ -7555,37 +7750,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Перечень копий"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7634,85 +7829,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Перечень копий"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Перечень копий"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Невозможно найти узел для копии %s"
@@ -7799,24 +7994,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7826,7 +8021,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7840,22 +8035,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "разделы не найдена"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Ошибка создания виртуального интерфейса"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "разделы не найдена"
@@ -7968,12 +8159,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8229,12 +8420,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Ошибка обновления агента: %(resp)r"
@@ -8263,23 +8454,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Получить консольный вывод для копии %s"
@@ -8293,7 +8484,7 @@ msgstr "Версия агента копии: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8655,12 +8846,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Перечень копий"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: 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"
@@ -8826,7 +9017,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8865,242 +9056,242 @@ msgstr "Ошибка поиска vbd для vdi %s"
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "том группы %s не существует"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Неполадка с подключением к libvirt"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Выполнение остановки копий"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Сети не определены."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Сети не определены."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "снимок %s: создание завершено"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr "Создание изображения"
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9108,19 +9299,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: nova/virt/libvirt/driver.py:2463
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9129,33 +9320,48 @@ msgstr ""
 "Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2708
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9164,25 +9370,25 @@ msgstr ""
 "Невозможно получить количество ЦПУ, так как эта возможность не "
 "реализована для этой платформы. Эту ошибку можно безопасно пропустить."
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "устаревшая версия libvirt (не поддерживается getVersion)"
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9190,21 +9396,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9213,29 +9419,29 @@ msgstr ""
 "Создание временного файла %s для оповещения других узлов сети compute о "
 "необходимости присоединения того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9245,7 +9451,7 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9254,22 +9460,22 @@ msgstr ""
 "Создание временного файла %s для оповещения других узлов сети compute о "
 "необходимости присоединения того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Ошибка аутентификации: %s"
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: nova/virt/libvirt/driver.py:3568
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9278,41 +9484,46 @@ msgstr ""
 "Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Копия %s: выполнение"
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9333,15 +9544,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "nwfilter(%(instance_filter_name)s) для%(name)s не найден."
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "Брандмауэр iptables: Настройка базовой фильтрации"
 
@@ -9532,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9581,7 +9793,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9589,7 +9801,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9597,7 +9809,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9818,7 +10030,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9968,32 +10180,32 @@ msgstr ""
 "Необходимо указать vmwareapi_host_ip,vmwareapi_host_username и "
 "vmwareapi_host_password useconnection_type=vmwareapi"
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "маркер [%s] не найден"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "В vmwareapi:_create_session, принято это исключение: %s"
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "В vmwareapi:_call_method, принято это исключение: %s"
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "Состояние задачи [%(task_name)s] %(task_ref)s: готово"
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "Состояние задачи [%(task_name)s] %(task_ref)s: ошибка %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "В vmwareapi:_poll_task, принята эта ошибка %s"
@@ -10008,34 +10220,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, fuzzy, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "Свойство %(attr)s не назначено для управляемого объекта %(objName)s"
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr "Отсутствуют зарегистрированные ВМ"
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "Завершение сеанса с неполадками или уже завершённого сеанса: %s"
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr "Сеанс имеет неполадки"
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "Недопустимый сеанс"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " Отсутствуют зарегистриованные виртуальные машины"
@@ -10258,12 +10470,12 @@ msgstr "Выполнение безотказной перезагрузки В�
 msgid "Did hard reboot of VM"
 msgstr "Выполнение безотказной перезагрузки ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Незарегистрированная ВМ %s"
@@ -10381,101 +10593,101 @@ msgstr "Выключение питания ВМ %s"
 msgid "Powered on the VM"
 msgstr "Питание ВМ %s выключено"
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Удалить том с идентификатором: %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "копия - %s не представлена"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr "В vmwareapi:_create_session, принято это исключение: %s"
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Удалить том с идентификатором: %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Создать том из снимка %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "Автоматическая безотказная перезагрузка %d"
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Создание папки с адресом %s"
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Создана папка с адресом %s"
@@ -10598,14 +10810,14 @@ msgstr "Ошибка поиска тома в базе данных"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Точка подключения %(mountpoint)s отсоединена от копии %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 "ВРЕМЯ ПРОСТОЯ: Срок вызова %(method)s истёк. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10614,94 +10826,75 @@ msgstr ""
 "НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
 "id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "Вызов %(method)s возвратил ошибку: %(e)s."
 
-#: nova/virt/xenapi/agent.py:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr "Запрос версии агента"
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Обновление агента до %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "Настройка пароля администратора"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr "Восстановление сети"
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr "Средства XenServer не установлены в этот образ"
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Ошибка OpenSSL: %s"
@@ -10721,56 +10914,56 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr "Запуск узла на XenServer не поддерживается."
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 "Невозможно выполнить вход в XenAPI (недостаточно свободного места на "
 "Dom0?)"
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Исключение: %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake не имеет реализации для %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Выполняется вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Выполняется вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11040,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 "
@@ -11071,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 "
@@ -11276,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 "
@@ -11294,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 ""
 
@@ -11658,32 +11851,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr "Ошибка в соглашении: %s"
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr "Недопустимый запрос: %s"
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr "Запрос: %s"
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr "Запрос сделан с отсутствующим токеном: %s"
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr "Запрос сделан с недопустимым токеном: %s"
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr "Непредвиденная ошибка: %s"
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "Запуск узла сети nova-xvpvncproxy (версия %s)"
@@ -11703,9 +11896,18 @@ msgstr "Образ должен быть доступен"
 msgid "status must be 'available'"
 msgstr "Образ должен быть доступен"
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 b06680aa1..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-17 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) "
@@ -81,298 +81,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -380,85 +380,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -466,896 +466,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1370,15 +1391,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1400,17 +1421,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1443,120 +1464,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1570,7 +1601,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1716,261 +1747,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2140,89 +2166,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2270,6 +2314,7 @@ msgstr ""
 #: 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 ""
 
@@ -2316,21 +2361,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2338,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 ""
 
@@ -2362,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 ""
 
@@ -2375,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 ""
 
@@ -2421,9 +2472,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2552,136 +2603,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2722,6 +2777,7 @@ msgstr ""
 #: 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 ""
 
@@ -2761,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 ""
 
@@ -2882,7 +2939,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2922,32 +2980,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2958,40 +3016,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3025,7 +3090,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3073,7 +3138,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3264,30 +3329,36 @@ 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 "
@@ -3299,7 +3370,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3316,16 +3387,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3349,7 +3420,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3408,12 +3479,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3432,106 +3508,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3542,42 +3631,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3589,7 +3678,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3622,35 +3711,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3671,312 +3809,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3990,244 +4128,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4291,12 +4429,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4317,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5067,11 +5225,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5087,15 +5245,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5174,7 +5351,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5196,44 +5373,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5329,47 +5506,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5575,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 ""
@@ -5771,151 +5948,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,12 +6114,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6144,11 +6322,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6198,11 +6386,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6627,86 +6810,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6741,35 +6917,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6793,7 +6969,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6811,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 ""
@@ -6862,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"
@@ -7053,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7225,19 +7421,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7247,25 +7443,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7274,7 +7470,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7296,20 +7492,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7328,37 +7524,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7406,85 +7602,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7569,24 +7765,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7596,7 +7792,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7610,22 +7806,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7738,12 +7930,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7996,12 +8188,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8030,23 +8222,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8059,7 +8251,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8411,12 +8603,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8574,7 +8766,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8613,236 +8805,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8850,76 +9042,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8927,50 +9134,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8980,69 +9187,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9061,15 +9273,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9260,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9308,7 +9521,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9316,7 +9529,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9324,7 +9537,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9535,7 +9748,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9681,32 +9894,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9721,34 +9934,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9960,11 +10173,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10069,100 +10282,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10283,106 +10496,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10398,54 +10592,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10705,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 "
@@ -10934,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 ""
 
@@ -11289,32 +11483,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11332,9 +11526,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 27d15ea14..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-17 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) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 ac2a419c4..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-17 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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1419,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1441,120 +1462,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1568,7 +1599,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1714,261 +1745,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2138,89 +2164,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2268,6 +2312,7 @@ msgstr ""
 #: 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 ""
 
@@ -2314,21 +2359,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2336,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 ""
 
@@ -2360,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 ""
 
@@ -2373,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 ""
 
@@ -2419,9 +2470,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2550,136 +2601,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2720,6 +2775,7 @@ msgstr ""
 #: 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 ""
 
@@ -2759,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 ""
 
@@ -2880,7 +2937,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2920,32 +2978,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2956,40 +3014,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3023,7 +3088,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3071,7 +3136,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3262,30 +3327,36 @@ 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 "
@@ -3297,7 +3368,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3314,16 +3385,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3347,7 +3418,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3406,12 +3477,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3430,106 +3506,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3540,42 +3629,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3587,7 +3676,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3620,35 +3709,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3669,313 +3807,313 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "natanggap %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 2200cba08..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-17 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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1419,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1441,120 +1462,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1568,7 +1599,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1714,261 +1745,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2138,89 +2164,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2268,6 +2312,7 @@ msgstr ""
 #: 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 ""
 
@@ -2314,21 +2359,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2336,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 ""
 
@@ -2360,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 ""
 
@@ -2373,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 ""
 
@@ -2419,9 +2470,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2550,136 +2601,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2720,6 +2775,7 @@ msgstr ""
 #: 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 ""
 
@@ -2759,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 ""
 
@@ -2880,7 +2937,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2920,32 +2978,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2956,40 +3014,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3023,7 +3088,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3071,7 +3136,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3262,30 +3327,36 @@ 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 "
@@ -3297,7 +3368,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3314,16 +3385,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3347,7 +3418,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3406,12 +3477,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3430,106 +3506,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3540,42 +3629,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3587,7 +3676,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3620,35 +3709,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3669,312 +3807,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3988,244 +4126,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4289,12 +4427,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5065,11 +5223,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5085,15 +5243,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5172,7 +5349,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5194,44 +5371,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5327,47 +5504,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5573,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 ""
@@ -5769,151 +5946,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5934,12 +6112,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6142,11 +6320,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6196,11 +6384,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6625,86 +6808,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6739,35 +6915,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6791,7 +6967,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6809,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 ""
@@ -6860,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"
@@ -7051,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7223,19 +7419,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7245,25 +7441,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7272,7 +7468,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7294,20 +7490,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7326,37 +7522,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7404,85 +7600,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7567,24 +7763,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7594,7 +7790,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7608,22 +7804,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7736,12 +7928,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7994,12 +8186,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8028,23 +8220,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8057,7 +8249,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8409,12 +8601,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8572,7 +8764,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8611,236 +8803,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8848,76 +9040,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8925,50 +9132,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8978,69 +9185,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9059,15 +9271,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9258,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9306,7 +9519,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9314,7 +9527,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9322,7 +9535,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9533,7 +9746,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9679,32 +9892,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9719,34 +9932,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9958,11 +10171,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10067,100 +10280,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10281,106 +10494,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10396,54 +10590,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10703,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 "
@@ -10932,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 ""
 
@@ -11287,32 +11481,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11330,9 +11524,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 542c9ae94..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-17 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"
@@ -81,160 +81,160 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr "Bayrakların yolu: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Bilinmeyen bir istisna oluştu."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Özel anahtar çözümü başarısız: %s"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Özel anahtar çözümü başarısız: %s"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Sanal arayüz oluşturma hatası"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "Hata. Eşsiz mac adresiyle sanal arayüz oluşturmada 5 kez girişim yapıldı."
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Yetkiniz yok."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Kullanıcı yönetici ayrıcalıklarına sahip değil"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "%(action)s uygulanmasına izin verilmiyor."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Kabul edilemez parametreler var."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "%(volume_id)s bölümü hiçbir şeyle ilişkilendirilmedi"
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Anahtar çifti verisi geçersiz"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "İstek geçersiz"
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Geçersiz giriş yapıldı"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Geçersiz bölüm"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "Geçersiz metadata"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Geçersiz port aralığı %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Geçersiz IP %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Geçersiz içerik türü %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Geçersiz CIDR %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "Hatalar: %(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -243,16 +243,16 @@ msgstr ""
 "%(aggregate_id)s üzerinde '%(action)s' eylemi gerçekleştirilemiyor. "
 "Nedeni: %(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -261,116 +261,116 @@ msgstr ""
 "%(attr)s %(state)s 'deki %(instance_uuid)s örneği. Örnek bu durumda iken "
 "%(method)s yapılamaz."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "%(instance_id)s örneği çalışmıyor."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Şu anda servis kullanılamıyor."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Hesaplama servisi şu anda kullanılamıyor."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Desteklenen hypervisor türü geçersiz."
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Örnek şu ankinden daha yeni hypervisor versiyonu gerektirir."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "Desteklenen disk yolu (%(path)s) halen var,fakat var olmaması gerekir."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Desteklenen cihaz yolu (%(path)s) geçersiz."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Kabul edilemeyen CPU bilgisi"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s geçerli bir IP v4/6 adresi değildir."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -379,7 +379,7 @@ msgstr ""
 "VLAN etiketi %(bridge)s port grubu için uygun değil. Beklenen VLAN "
 "etiketi %(tag)s'dir, fakat tek ilişkili port grubu %(pgroup)s'dir."
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -390,85 +390,85 @@ msgstr ""
 "ilişkilendirilmemiştir. Beklenen vSwitch %(expected)s'dir, fakat "
 "ilişkilendirilen ise %(actual)s'dir."
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "%(disk_format)s disk formatı kabul edilemez."
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "%(image_id)s imajı kabul edilemez: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "%(instance_id)s örneği kabul edilemez: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "%(ec2_id)s Ec2 id'si kabul edilemez."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Geçersiz CIDR %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Kaynak bulunamadı."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "%(id)s ile ilişkilendirilmiş bir dinamik IP yok."
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "%(volume_id)s bölümü bulunamadı."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "%(snapshot_id)s sistem anlık görüntüsü bulunamadı."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "%(volume_id)s bölümü için hedef id bulunamadı."
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "%(location)s'da disk yok."
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "%(driver_type)s bölümü için bir işleyici bulunamadı."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Geçersiz %(image_href)s imaj kaynak dosyası."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "%(image_id)s imaj kaynak dosyası bulunamadı."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -476,65 +476,65 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "%(project_id)s projesi bulunamadı."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "VDI'ya okuma/yazma yapılırken SR(Saklama deposu) bulunamadı."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "%(network_id)s ağı bulunamadı."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "Ağ oluşturulurken %(req)s gereklidir."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "%(network_id)s ağı bulunamadı."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "%(snapshot_id)s sistem anlık görüntüsü bulunamadı."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr " %(bridge)s köprüsü için ağ bulunamadı."
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "%(uuid)s UUID'si için bir ağ bulunamadı"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "%(cidr)s CIDR ile bir ağ bulunamadı."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -543,239 +543,235 @@ msgstr ""
 "%(network_uuid)s ağ UUID verilmedi veya %(project_id)s projesi ile "
 "ilişkilendirilmedi."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "VM'nin kullandığı veri deposu referansı(ları) bulunamadı."
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "%(id)s ile ilişkilendirilmiş bir dinamik IP yok."
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "%(address)s adresi için bir dinamik IP bulunamadı."
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 "%(network_id)s ağında %(host)s ağ sunucusunun hiç dinamik IP'si yok.\n"
 " "
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "(%(network_uuid)s) ağında bir (%(address)s) dinamik IP adresi yok."
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "%(address)s dinamik IP adresi geçersiz."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "Kullanılabilir hiç dinamik IP yok."
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "Hiç dinamik IP bulunamadı."
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "%(id)s ID'si için değişken IP bulunamadı."
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "%(domain)s alanında %(name)s DNS girdisi halen var."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "%(address)s adresi için bir değişken IP bulunamadı."
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr " %(host)s sunucusu için bir değişken IP bulunamadı."
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "Hiç mevcut değişken IP yok."
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "%(address)s değişken IP adresi ilişkilendirildi."
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "%(address)s değişken IP adresi ilişkilendirilemedi."
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "Hiç değişken IP yok."
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "%(interface)s arayüzü bulunamadı."
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "%(user_id)s kullanıcısı için %(name)s anahtar çifti bulunamadı"
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr "%(certificate_id)s sertifikası bulunamadı"
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "%(service_id)s servisi bulunamadı."
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "%(host)s sunucusu bulunamadı."
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "%(host)s hesaplama sunucusu bulunamadı."
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "%(host)s sunucusunda %(binary)s ikilisi bulunamadı."
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Kota bulunamadı."
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "%(project_id)s projesi için bir kota bulunamadı."
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "%(security_group_id)s güvenlik grubu bulunamadı."
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "%(project_id)s projesi için %(security_group_id)s güvenlik grubu "
 "bulunamadı."
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/exception.py:747
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -784,7 +780,7 @@ msgstr ""
 "%(security_group_id)s güvenlik grubu zaten %(instance_id)s örneği ile "
 "ilişkilendirimiş."
 
-#: nova/exception.py:752
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -793,37 +789,37 @@ msgstr ""
 "%(security_group_id)s güvenlik grubu %(instance_id)s örneği ile "
 "ilişkilendirilmedi."
 
-#: nova/exception.py:757
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "%(migration_id)s göçü bulunamadı."
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "%(status)s durumuyla %(instance_id)s örneği için göç bulunamadı."
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "%(pool_id)s konsol havuzu bulunamadı."
 
-#: nova/exception.py:784
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -832,104 +828,109 @@ msgstr ""
 "%(host)s roxy sunucusundaki %(compute_host)s hesaplama sunucusu için "
 "%(console_type)s türünün konsol havuzu bulunamadı."
 
-#: nova/exception.py:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "%(console_id)s konsolu bulunamadı."
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Geçersiz içerik türü %(content_type)s."
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "%(instance_type_id)s örnek türü bulunamadı"
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "%(instance_type_name)s isimli örnek türü bulunamadı."
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "%(flavor_id)s örnek türü bulunamadı."
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "%(name)s örneği zaten var."
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "%(filter_name)s zamanlayıcı sunucu filtresi bulunamadı."
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -938,453 +939,473 @@ msgstr ""
 "%(instance_type_id)s örnek türü %(extra_specs_key)s anahtarı ile ekstra "
 "özelliklere sahip değil."
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "%(file_path)s dosyası bulunamadı."
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr "Hiç dosya bulunamadı."
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "%(adapter)s ağ bağdaştırıcısı ile ilişkilendirilen sanal anahtar "
 "bulunamadı."
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "%(adapter)s ağ bağdaştırıcısı bulunamadı."
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "%(class_name)s sınıfı bulunamadı: %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "İşlem için izin verilmiyor."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr "Önceki sistem geri görüntüsüne dönmek için izin verilmiyor."
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr "Yedek imajı geri dönüş parametresi gerekli"
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "%(key_name)s anahtar çifti zaten var."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "%(name)s örneği zaten var."
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "Geçiş hatası."
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "Geçiş hatası."
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Hatalı biçimlendirilmiş mesaj gövdesi: %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "%(path)s'deki yapılandırma bulunamadı"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr "Örnek türün belleği istenilen imaj dosyası için çok küçük."
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr "Örnek türünün diski istenilen imaj dosyası için çok küçük."
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "%(uuid)s hesaplama düğümü başlatmada yetersiz boş hafıza."
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Bu sunucu için bant genişliği/cpu/disk ölçümleri alınamadı."
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Geçerli bir sunucu bulunamadı: %(reason)s"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Kota aşıldı"
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr "Kişisel dosya limiti aşıldı"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr "Kişisel dosya yolu çok uzun"
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr "Kişisel dosya içeriği çok uzun"
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "%(aggregate_id)s kümesi bulunamadı."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "%(aggregate_name)s kümesi zaten var."
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "%(aggregate_id)s kümesi %(host)s sunucusuna sahip değil."
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 "%(aggregate_id)s kümesi %(metadata_key)s. anahtarı ile hiç metadata'sı "
 "yok."
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "%(aggregate_id)s kümesi zaten%(host)s sunucusuna sahip."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr "Örnek tür oluşturulamıyor."
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "%(volume_id)s bölümü bulunamadı."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "%(project_id)s projesi bulunamadı."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: 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:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: 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:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1399,15 +1420,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Yetenekler zamanlayıcısı bildiriliyor ..."
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
@@ -1430,17 +1451,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1473,120 +1494,130 @@ 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:436
-#, fuzzy, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr "Bilinmeyen temel dosya: %s"
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Geçersiz server_string: %s"
 
-#: nova/utils.py:724
+#: 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:778 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:900 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:1060
+#: 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:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "%r adresini bulmak olanaksız"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "%r adresini bulmak olanaksız"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "%r adresini bulmak olanaksız"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr "WSGI sunucusu durduruluyor."
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr "WSGI sunucusu durduruldu."
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "__call__ fonksiyonunu uygulamalısınız."
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1600,7 +1631,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1749,261 +1780,256 @@ msgstr "Bilinmeyen bir hata oluştu. Lütfen tekrar deneyin."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Desteklenmeyen API isteği: kontrolcü = %(controller)s, işlem = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Bölüm %s'in sistem anlık görüntüsünü oluştur"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "%s anahtar çiftini oluştur"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "%s anahtarını içeriye aktar"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "%s anahtar çiftini sil"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Geçersiz IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Belirlenmiş parametreler için hiç kural yok"
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "%s sistem görüntüsünden birim oluştur"
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "%s GB'lık birim oluştur"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla"
 
-#: nova/api/ec2/cloud.py:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Birimi ayır %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "Özellik desteklenmiyor: %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "birim = %s\n"
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Adres tahsisi"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "%s adresini serbest bırak"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "%(instance_id)s örneğine %(public_ip)s adresini ilişkilendir"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Adresi kes %s"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "İmaj müsait olmak zorunda"
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "%r örneğini tekrar yükle"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "Örnekler durdurulacak"
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "Örnekler başlatılacak"
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "%s imaj kaydı siliniyor"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "%(image_id)s id ile %(image_location)s imajı kaydedildi"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "Kullanıcı veya grup belirlenmedi"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "Sadece \"all\" grubu destekleniyor"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "İşlem türü eklenmek veya kaldırılmak zorunda"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "%s imaj tanıtımı güncelleniyor"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "%d saniye içinde örnek durdurulamadı"
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2176,89 +2202,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Örnek %(attr)s %(state)s'de iken '%(action)s' yapılamaz"
 
 #: 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
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "Örnek '%(action)s' için geçersiz durumda"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Sistem görüntüsü isteği reddedildi, sistem görüntüleri şu anda devre dışı."
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Örnek sistem görüntüleri şu an onaylanmadı."
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Yüklenen bölüm: %s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr "Ext adı: %s"
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Ext takma adı: %s"
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr "Ext açıklaması: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Ext isim uzayı: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Ext güncellendi: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "İstisna yükleme uzantısı: %s"
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Genişletme yükleniyor: %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "Genişletme fabrikası çağırılıyor %s"
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "%(ext_factory)s uzantısı yüklemede hata: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "%(classpath)s uzantısı yüklemede hata: %(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "%(ext_name)s uzantısı yüklemede hata: %(exc)s"
 
+#: 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 "JSON dosyası anlaşılamadı"
@@ -2306,6 +2350,7 @@ msgstr "Böyle bir işlem yok: %s"
 #: 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 "Kusurlu istek gövdesi"
 
@@ -2354,21 +2399,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr "alt sınıflar yapıcı() oluşturmak zorunda!"
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2376,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ı"
 
@@ -2400,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 ""
 
@@ -2413,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."
 
@@ -2459,9 +2510,9 @@ msgstr "%(flavor_id)s örnek türü bulunamadı."
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 "Örnek bulunamadı."
 
@@ -2590,114 +2641,118 @@ msgstr "İstenilen imaj dosyası bulunamadı"
 msgid "Invalid key_name provided."
 msgstr "Geçersiz anahtar adı verildi."
 
+#: 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:1081
+#: 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:1085
+#: 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:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1049
-#: nova/api/openstack/compute/plugins/v3/servers.py:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1069
-#: nova/api/openstack/compute/plugins/v3/servers.py:1151
+#: 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:1091
-#: nova/api/openstack/compute/plugins/v3/servers.py:1173
+#: 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:1094
-#: nova/api/openstack/compute/plugins/v3/servers.py:1176
+#: 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:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: 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:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1138
-#: nova/api/openstack/compute/plugins/v3/servers.py:1220
+#: 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:1165
-#: nova/api/openstack/compute/plugins/v3/servers.py:1253
+#: 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:1178
-#: nova/api/openstack/compute/plugins/v3/servers.py:1266
+#: 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:1182
 #: nova/api/openstack/compute/servers.py:1391
-#: nova/api/openstack/compute/plugins/v3/servers.py:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1188
-#: nova/api/openstack/compute/plugins/v3/servers.py:1276
+#: 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:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1210
-#: nova/api/openstack/compute/plugins/v3/servers.py:1298
+#: 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:1213
-#: nova/api/openstack/compute/plugins/v3/servers.py:1301
+#: 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 "
@@ -2705,30 +2760,30 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
+#: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr "Geçersiz istek gövdesi"
 
 #: nova/api/openstack/compute/servers.py:1237
-#: nova/api/openstack/compute/plugins/v3/servers.py:1325
+#: 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:1298
-#: nova/api/openstack/compute/plugins/v3/servers.py:1386
+#: 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:1332
-#: nova/api/openstack/compute/plugins/v3/servers.py:1420
+#: 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:1417
-#: nova/api/openstack/compute/plugins/v3/servers.py:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "Sorgudan '%(unk_opt_str)s' seçenekleri kaldırılıyor"
@@ -2769,6 +2824,7 @@ msgstr ""
 #: 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 ""
 
@@ -2809,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ı"
 
@@ -2934,7 +2991,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 "Sadece kök sertifikası alınabilir."
 
@@ -2977,34 +3035,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "XVP çalışmıyor..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Geçersiz metadata"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "%s güvenlik grubu zaten var"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, fuzzy, python-format
 msgid "Coverage doesn't have %s action"
 msgstr "Kümeler %s işlemine sahip değil"
@@ -3015,41 +3073,48 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s 'MANUAL' veya 'AUTO' olmak zorunda"
 
 #: 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
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "Sunucu ve blok_göçü tanımlanmak zorunda."
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Göçte hata %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 ""
 
@@ -3084,7 +3149,7 @@ msgstr "%(address)s değişken IP adresi ilişkilendirildi."
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr "Parametre dizini eksik"
 
@@ -3133,7 +3198,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "%(address)s değişken IP adresi ilişkilendirilemedi."
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3328,30 +3393,36 @@ msgid "Create networks failed"
 msgstr "Tanımlı bir ağ yok."
 
 #: 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 "
@@ -3363,7 +3434,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr "Bozuk scheduler_hints özelliği"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Geçerli bir kuralı oluşturmak için yeterli parametre yok."
 
@@ -3382,16 +3453,16 @@ msgstr "%s id'li ağ gösteriliyor"
 msgid "security group default rule not found"
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Global ipv6 için yanlış sonek: %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "Güvenlik grubu belirlenmedi"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "Güvenlik grup adı boş bırakılamaz"
 
@@ -3415,7 +3486,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 #, fuzzy
 msgid "Unknown service"
 msgstr "Kimlik doğrulama hatası"
@@ -3475,12 +3546,17 @@ msgstr "Yüklenen bölüm: %s"
 msgid "Ext version: %i"
 msgstr "Ext açıklaması: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "%s adresini serbest bırak"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "%s adresini serbest bırak"
@@ -3499,107 +3575,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: nova/api/openstack/compute/plugins/v3/servers.py:1031
 #, fuzzy, python-format
 msgid "Running _create_extension_point for %s"
 msgstr "Genişletme fabrikası çağırılıyor %s"
 
-#: nova/api/openstack/compute/views/servers.py:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: 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:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3610,42 +3699,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3657,7 +3746,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3690,35 +3779,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "eleman çocuk değil"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3739,323 +3877,323 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "Başlangıç adresi"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "Hiç dinamik IP bulunamadı."
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "Örnekle değişken IP ilişkilendirilmedi"
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "Başlangıç adresi"
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "proje"
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "Ağ bulunamadı"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "Ağ oluşturulurken %(req)s gereklidir."
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "%r örneğini tekrar yükle"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "%(service_id)s servisi bulunamadı."
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "%(service_id)s servisi bulunamadı."
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 #, fuzzy
 msgid "PROJECT"
 msgstr "proje"
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 #, fuzzy
 msgid "Must supply valid parameters to create instance_type"
 msgstr "Örnek tür oluşturulamıyor."
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "Örnek mevcut değil"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 #, fuzzy
 msgid "Unknown error"
 msgstr "Kimlik doğrulama hatası"
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 #, fuzzy
 msgid "Valid instance type name is required"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4069,115 +4207,115 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: 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:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2066
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4186,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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: 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:2903
+#: 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:2911
+#: 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:2917
+#: 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:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "%s güvenlik grubunu oluşturunuz"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "%s güvenlik grubu zaten var"
 
-#: nova/compute/api.py:2964
+#: 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:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: 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:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: 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:3145
+#: 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:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
@@ -4374,13 +4512,13 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than or equal to 0"
-msgstr "yedekOluşturma 'dönüşme' özelliği tamsayı olmak zorunda"
+#, 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"
@@ -4400,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: 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:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:616
+#: 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:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr "Durum kontrol ediliyor"
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: 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:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr "Örnek başlatılıyor.."
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Örnek ağ_bilgisi: |%s|"
 
 #: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1332
+#: 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:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s örneği"
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "DiskBulunamadı yok sayılıyor: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "Blok cihazı haritalandırması kapatılıyor %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Birimi ayır %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: 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:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "İmaj siliniyor %s"
 
-#: nova/compute/manager.py:2014
+#: 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:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Örneğin hiç bölümü yok."
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "dedef kaynak ile aynı!"
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Konsol ekleniyor"
 
-#: nova/compute/manager.py:3003
+#: 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:3054
+#: 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:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: 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:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: 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:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: 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:3895
+#: 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:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "Sunucu durumu güncelleniyor"
 
-#: nova/compute/manager.py:3936
+#: nova/compute/manager.py:3987
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4983,84 +5141,84 @@ msgstr ""
 "Veritabanında %(num_db_instances)s ve misafir sistemde "
 "%(num_vm_instances)s bulundu"
 
-#: nova/compute/manager.py:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr "Silinen örnek kurtarılıyor"
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "İmaj siliniyor %s"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5161,11 +5319,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "%s örneği için sunucu bulma başarısız"
@@ -5181,15 +5339,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 "Konsol ekleniyor"
@@ -5270,7 +5447,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5293,44 +5470,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Tanınmayan silinmiş okuma değeri '%s'"
 
-#: nova/db/sqlalchemy/api.py:662
+#: 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:883
+#: 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:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: 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:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "%s geçerli bir örnek ismidir"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5427,47 +5604,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr "İmaj siliniyor %s"
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "%(image_path)si için %(image_location)s indirme işlemi başarısız"
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "%(image_path)s için %(image_location)s çözümü başarısız"
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "%(image_path)s için %(image_location)s çıkarma işlemi başarısız"
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "%(image_path)s için %(image_location)s yükleme işlemi başarısız"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "Özel anahtar çözümü başarısız: %s"
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Başlatma vektörü çözümü başarısız: %s"
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "%(image_file)s imaj dosyası çözümü başarısız: %(err)s"
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr "İmajda güvenliksiz dosya isimleri var"
 
@@ -5674,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 ""
@@ -5871,158 +6048,158 @@ 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"
 
-#: nova/network/quantumv2/__init__.py:67
-#, fuzzy
-msgid "quantum authentication failed"
-msgstr "Kimlik doğrulama hatası"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "Öğe bulunamadı"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Yakalama hatası: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Yakalama hatası: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "%(project_id)s projesi için %(security_group_id)s güvenlik grubu "
 "bulunamadı."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6046,12 +6223,12 @@ msgstr "XVP başlatılırken hata oluştu: %s"
 msgid "Invalid version string"
 msgstr "Geçersiz server_string: %s"
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6254,11 +6431,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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
+#, fuzzy, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr "Bilinmeyen temel dosya: %s"
+
 #: nova/openstack/common/db/sqlalchemy/session.py:462
 msgid "DB exception wrapped."
 msgstr "Veritabanı istisnası yakalandı."
@@ -6308,11 +6495,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6738,86 +6920,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "Uygun servis çalışıyor mu?"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "Başka bir işlem bulunamadı"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "%(num_instances)d örnek(leri) kurulmaya çalışılıyor."
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "Geçersizİstek hatası: %s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "%(hosts)s filtrelendi"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "%(hosts)s filtrelendi"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
@@ -6852,36 +7027,36 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "%s işlem ID'si için servis yok"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
-#, 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'"
 msgstr "%(filename)s dosyası için zamanlayıcı seçenekleri başlatılamadı: '%(e)s'"
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "Zamanlayıcı seçenekleri çözülemedi: '%(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
@@ -6904,7 +7079,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6922,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 ""
@@ -6973,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"
@@ -7167,60 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "Örnekler çalışıyor: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "Örnekleri sonlandırmanın ardından: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "İçsel hata"
 
-#: nova/tests/compute/test_compute.py:4135
+#: 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:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "Kimlik doğrulama hatası"
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7344,19 +7539,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Konuk aracı benzetmek için %s'de dosyalar oluşturuluyor"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "%s'deki benzetilmiş konuk aracı dosyaları kaldırılıyor"
@@ -7366,25 +7561,25 @@ msgstr "%s'deki benzetilmiş konuk aracı dosyaları kaldırılıyor"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Sanallaştırma sürücüsü yükleme başarısız: %s"
@@ -7394,7 +7589,7 @@ msgstr "Sanallaştırma sürücüsü yükleme başarısız: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7416,20 +7611,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7448,37 +7643,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7529,85 +7724,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "|%s| örneği için değişken IP tahsisi"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "%s örneği için sunucu bulma başarısız"
@@ -7693,24 +7888,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7720,7 +7915,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr "Örnekle değişken IP ilişkilendirilmedi"
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7734,23 +7929,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "Daha fazla değişken IP mevcut değil"
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "%(interface)s arayüzü bulunamadı"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Sanal arayüz oluşturma hatası"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7863,12 +8053,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8121,12 +8311,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8155,23 +8345,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8184,7 +8374,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8538,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:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8702,7 +8892,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8741,239 +8931,239 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Örnekler durdurulacak"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8981,76 +9171,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9058,21 +9263,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: nova/virt/libvirt/driver.py:3041
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9081,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:3077
+#: 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:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9118,7 +9323,7 @@ msgstr ""
 " \n"
 " Bkz: %(u)s"
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3231
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9127,64 +9332,69 @@ 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: 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 %(path)s since it looks like volume"
-msgstr "Birim gibi göründüğünden beri %(path)s atlanıyor"
+msgid "skipping disk for %s as it does not have a path"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3609
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk %(path)s (%(target)s) as it is a volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3649
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9203,15 +9413,15 @@ msgstr "Durağan filtreler koruma altına alındı"
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr "(%(instance_filter_name)s) ağ filtresi bulunamadı."
+msgid "The nwfilter(%s) is not found."
+msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "%(name)s için (%(instance_filter_name)s) ağ filtresi bulunamadı."
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptabloları güvenlik duvarı: Temel Filtreleme Kurulumu"
 
@@ -9404,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: 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:314
+#: 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:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9452,7 +9663,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9460,7 +9671,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9468,7 +9679,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9680,7 +9891,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9826,32 +10037,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr " [%s] göstergesi bulunamadı"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9866,34 +10077,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10105,11 +10316,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10214,100 +10425,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "%s sistem görüntüsünden birim oluştur"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "%s sistem görüntüsünden birim oluştur"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10430,106 +10641,87 @@ msgstr "Geçersiz bölüm"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10545,54 +10737,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10852,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 "
@@ -11083,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 ""
 
@@ -11442,32 +11634,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11487,9 +11679,18 @@ msgstr "İmaj müsait olmak zorunda"
 msgid "status must be 'available'"
 msgstr "İmaj müsait olmak zorunda"
 
-#~ msgid "Cannot reboot instance: %s"
+#~ msgid "Cannot disassociate auto assigined floating ip"
 #~ msgstr ""
 
-#~ msgid "No Volume Connector found."
+#~ 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 1ae68e61a..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-17 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"
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1716,262 +1747,257 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Це правило вже існує в групі %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "лише група \"всі\" підтримується"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2141,89 +2167,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2271,6 +2315,7 @@ msgstr ""
 #: 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 ""
 
@@ -2317,21 +2362,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2339,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 ""
 
@@ -2363,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 ""
 
@@ -2376,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 ""
 
@@ -2422,9 +2473,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2553,136 +2604,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2723,6 +2778,7 @@ msgstr ""
 #: 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 ""
 
@@ -2762,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 ""
 
@@ -2883,7 +2940,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2923,32 +2981,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2959,40 +3017,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3026,7 +3091,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3074,7 +3139,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3265,30 +3330,36 @@ 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 "
@@ -3300,7 +3371,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3318,16 +3389,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3351,7 +3422,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3410,12 +3481,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3434,106 +3510,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3544,42 +3633,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3591,7 +3680,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3624,35 +3713,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3673,313 +3811,313 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "отримано %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3993,244 +4131,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4294,12 +4432,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4320,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5071,11 +5229,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5091,15 +5249,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5178,7 +5355,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5200,44 +5377,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5333,47 +5510,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5579,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 ""
@@ -5775,152 +5952,153 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5941,12 +6119,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6149,11 +6327,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6203,11 +6391,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6815,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,35 +6922,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6974,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6816,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 ""
@@ -6867,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"
@@ -7058,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7230,19 +7426,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7448,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7475,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7301,20 +7497,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7333,37 +7529,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7607,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7574,24 +7770,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7797,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7811,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7935,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8193,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8227,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8256,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8608,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8771,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8810,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +9047,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +9139,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9192,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9278,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9313,7 +9526,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9321,7 +9534,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9329,7 +9542,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9540,7 +9753,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9899,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9939,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10178,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10287,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Від'єднати том %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Від'єднати том %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10501,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10597,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Оголошення черги %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10710,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 "
@@ -10939,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 ""
 
@@ -11295,32 +11489,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11338,9 +11532,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 518f12938..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-17 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) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 ae45d17ed..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-17 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"
@@ -81,302 +81,302 @@ msgstr "重新启动实例失败"
 msgid "Flags path: %s"
 msgstr "标记所在路径：%s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "发生未知异常。"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "解密文本失败"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "解密文本失败"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "虚拟接口创建失败"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "用唯一mac地址5次尝试创建虚拟接口失败"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "未授权。"
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "用户没有管理员权限"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "政策不允许 %(action)s 被执行。"
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "没有为镜像 %(image_id)s 找到内核。"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "无法接受的参数。"
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 #, fuzzy
 msgid "Block Device Mapping is Invalid."
 msgstr "block_device_mapping %s"
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "卷 %(volume_id)s 没有附加任何东西"
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "密钥对数据无效"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "请求无效。"
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "收到无效的输入"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "无效的卷"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "无效的元数据"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "无效的元数据键"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "无效的端口范围 %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "无效的IP协议 %(protocol)s。"
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "无效的内容类型 %(content_type)s。"
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "无效的cidr %(cidr)s。"
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr "无法执行action '%(action)s' 于聚合 %(aggregate_id)s 上。原因： %(reason)s。"
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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 "实例 %(instance_uuid)s 处于%(attr)s %(state)s 中。该实例在这种状态下不能执行 %(method)s。"
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "实例 %(instance_id)s 没有运行。"
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "实例 %(instance_id)s 没有挂起。"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "挂起实例失败"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "此时的付不可用。"
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "此时的计算服务不可用。"
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "无法把实例 (%(instance_id)s) 迁移到当前主机 (%(host)s)。"
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "提供的虚拟机管理程序类型无效。"
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "该实例需要比当前版本更新的虚拟机管理程序。"
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "提供的磁盘路径 (%(path)s) 已经存在，预计是不存在的。"
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "无法接受的CPU信息"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s 不是有效的IP v4/6地址。"
 
-#: nova/exception.py:411
+#: 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 "VLAN标签对于端口组%(bridge)s 是不适合的。预计的VLAN标签是 %(tag)s，但与端口组关联的是 %(pgroup)s。"
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -386,86 +386,86 @@ msgstr ""
 "包含端口组 %(bridge)s 的vSwitch没有与预计的物理适配器关联。预计的vSwitch是 %(expected)s，但关联的是 "
 "%(actual)s。"
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "磁盘格式 %(disk_format)s 不能接受"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "实例 %(instance_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s 无法接受。"
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "无效的cidr %(cidr)s。"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "实例 - %s 不存在"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "资源没有找到。"
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关联。"
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "在 %(location)s 没有磁盘"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "无法为 %(driver_type)s 卷找到句柄。"
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "无效的镜像href %(image_href)s。"
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -473,905 +473,926 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "没有找到存储库来读写VDI。"
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "创建网络 %(req)s  是必要的。"
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "无法为桥 %(bridge)s 找到网络"
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "无法为uuid %(uuid)s 找到网络"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "无法为cidr %(cidr)s 找到网络。"
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "没有网络定义。"
 
-#: nova/exception.py:545
+#: 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 "或者网络uuid %(network_uuid)s不存在，或者它没有分配给项目 %(project_id)s。"
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "无法找到虚拟机使用的数据存储引用。"
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关联。"
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "没有为地址 %(address)s 找到固定IP。"
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "实例 %(instance_id)s 没有固定ip。"
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "网络主机 %(host)s 在网络 %(network_id)s 中没有固定ip。"
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "实例 %(instance_id)s 没有固定ip '%(ip)s'。"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "固定IP地址 (%(address)s) 在网络 (%(network_uuid)s) 中不存在。"
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "固定IP地址 %(address)s 已在使用。"
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "固定IP地址 %(address)s 无效。"
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "没有固定ip可用。"
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "找不到固定IP。"
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "找不到适合id %(id)s 的浮动IP。"
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "DNS 入口 %(name)s 已经在域中 %(domain)s 存在。"
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "找不到适合地址 %(address)s 的浮动ip。"
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "找不到适合地址 %(address)s 的浮动ip。"
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "没有找到floating_ip"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "没有浮动IP可用。"
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "浮动ip %(address)s 没有被关联。"
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "没有浮动ip存在。"
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "接口 %(interface)s没有找到。"
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr "证书 %(certificate_id)s 没有找到。"
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "计算主机 %(host)s 没有找到。"
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。"
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "配额没有找到。"
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "用户 %(user_id)s 没有找到。"
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "扩展资源：%s"
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "安全组 %(security_group_id)s 没有找到。"
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr "没有找到安全组 %(security_group_id)s 针对项目 %(project_id)s 。"
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:747
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr "安全组 %(security_group_id)s 已经与实例 %(instance_id)s 关联。"
 
-#: nova/exception.py:752
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr "安全组 %(security_group_id)s 没有与实例 %(instance_id)s 关联。"
 
-#: nova/exception.py:757
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "迁移 %(migration_id)s 没有找到。"
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "没有为实例 %(instance_id)s 找到迁移其状态为 %(status)s 。"
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "控制台池 %(pool_id)s 没有找到。"
 
-#: nova/exception.py:784
+#: 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 "没有找到类型是 %(console_type)s 的控制台池针对计算主机 %(compute_host)s 在代理主机 %(host)s 上。"
 
-#: nova/exception.py:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "控制台%(console_id)s 没有找到。"
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制台。"
 
-#: nova/exception.py:798
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "没有为实例 %(instance_id)s 在池 %(pool_id)s 中找到控制台。"
 
-#: nova/exception.py:803
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "无效的控制台类型 %(console_type)s "
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "名为 %(instance_type_name)s 的实例类型没有找到。"
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "类型 %(flavor_id)s 没有找到。"
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "卷组 %s 不存在"
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 #, fuzzy
 msgid "Timeout waiting for response from cell"
 msgstr "等待RPC响应超时：%s"
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "实例类型 %(instance_type_id)s 没有额外的 键为%(extra_specs_key)s 的规格说明。"
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找不到文件 %(file_path)s。"
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr "没找到文件"
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "未找到与网络适配器 %(adapter)s 关联的虚拟交换机。"
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "未找到网络适配器 %(adapter)s。"
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "操作不允许。"
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr "快照不允许循环。"
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr "备份 image_type 要求循环参数。"
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "密钥对 %(key_name)s 已经存在。"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "实例 %(name)s 已经存在。"
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "迁移错误"
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "迁移错误"
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "调整时实例的大小必须要发生变化。"
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr "实例类型的内存对于所请求的镜像太小。"
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr "实例类型的磁盘对于所请求的镜像太小。"
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "没有足够的可用内存来启动计算节点  %(uuid)s。"
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "无法获取此主机的带宽、CPU和磁盘指标。"
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "超出配额"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr "超过个性化文件限制"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr "个性化文件路径太长"
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr "个性化文件内容太长"
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "找不到聚合 %(aggregate_id)s。"
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "聚合 %(aggregate_name)s 已经存在。"
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "聚合 %(aggregate_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr "无法创建实例类型。"
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "检测到已存在的id为%(vlan) vlan"
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制台。"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: 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:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: 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:1177
+#: 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:1181
+#: nova/exception.py:1187
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:1213
+#: 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:1218
+#: nova/exception.py:1224
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "期望的对象类型：%s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1386,15 +1407,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "向调度器通报能力。"
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "为ip： %s获取元数据失败"
@@ -1417,17 +1438,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1460,120 +1481,130 @@ 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:436
-#, fuzzy, python-format
-msgid "Unknown byte multiplier: %s"
-msgstr "未知的基文件：%s"
-
-#: nova/utils.py:553
+#: nova/utils.py:589
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "不正确的server_string：%s"
 
-#: nova/utils.py:724
+#: 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:778 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:900 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:1060
+#: nova/utils.py:1103
 #, fuzzy, python-format
 msgid "%s is not a string or unicode"
 msgstr "服务器名称不是字符串或者unicode"
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, fuzzy, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr "密钥对名称长度必须在1到255个字符之间"
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, fuzzy, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr "启动%(name)s 位置在 %(host)s:%(port)s"
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "无法找到地址 %r"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "无法找到地址 %r"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "无法找到地址 %r"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr "关闭WSGI服务器"
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr "WSGI服务器已经停止。"
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr "你必须执行 __call__"
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, fuzzy, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
@@ -1587,7 +1618,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1734,274 +1765,269 @@ msgstr "发生了一个未知的错误. 请重试你的请求."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "不支持的API请求：controller = %(controller)s，action = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "创建卷 %s 的快照"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "创建密钥对 %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "导入密钥 %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "删除密钥对 %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "参数不够创建有效规则。"
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "无效的IP协议 %(protocol)s。"
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "这条规则已经存在于组%s 中"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "从快照 %s 创建卷"
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的卷"
 
-#: nova/api/ec2/cloud.py:874
+#: nova/api/ec2/cloud.py:871
 #, fuzzy
 msgid "Delete Failed"
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:887
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "把卷 %(volume_id)s 附加到实例 %(instance_id)s 上位置在 %(device)s"
 
-#: nova/api/ec2/cloud.py:898
+#: nova/api/ec2/cloud.py:895
 #, fuzzy
 msgid "Attach Failed."
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:927
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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 "属性不支持: %s"
 
-#: nova/api/ec2/cloud.py:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "分配地址"
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "没有更多的浮动ip。"
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "释放地址 %s"
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "无法找到地址 %r"
 
-#: nova/api/ec2/cloud.py:1261
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "把地址 %(public_ip)s 关联到实例 %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "无法找到地址 %r"
 
-#: nova/api/ec2/cloud.py:1279
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, fuzzy, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr "存在多个固定IP，使用第一个：%s"
 
-#: nova/api/ec2/cloud.py:1288
+#: nova/api/ec2/cloud.py:1285
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "没有浮动IP可用。"
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "无法找到地址 %r"
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "取消地址 %s 的关联"
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "浮动ip %(address)s 没有被关联。"
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "镜像必须可用。"
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "准备开始终止实例"
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "重启实例 %r"
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "准备停止实例"
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "准备启动实例"
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "解除镜像 %s 的注册"
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "用id %(image_id)s 注册镜像 %(image_location)s"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "用户或者组没有确定"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "仅仅支持组\"all\""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type必须添加或者移除"
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "正在更新镜像 %s 的 publicity 属性"
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "无法在 %d 秒内停止实例"
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "获取实例列表"
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "实例 - %s 不存在"
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "获取实例列表"
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "无效的"
@@ -2175,89 +2201,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr "无效的元数据"
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "'%(action)s' 针对处于 %(attr)s %(state)s 的实例是无法进行"
 
 #: 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
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "实例针对 '%(action)s' 处于无效状态"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "拒绝快照请求，快照当前未被激活"
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "该时刻实例快照是不允许的。"
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "加载的扩展：%s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr "Ext name: %s"
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Ext alias: %s"
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr "Ext 描述: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Ext 命名空间: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Ext updated: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "加载扩展发生异常：%s"
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "正在加载扩展 %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "调用扩展工厂 %s"
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "加载扩展 %(ext_name)s 失败：%(exc)s"
 
+#: 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 "无法理解JSON"
@@ -2305,6 +2349,7 @@ msgstr "没有该动作：%s"
 #: 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 "错误格式的请求主体"
 
@@ -2351,21 +2396,24 @@ msgstr "模板数不匹配；把slave %(slavetag)s 添加到master %(mastertag)s
 msgid "subclasses must implement construct()!"
 msgstr "subclasses必须执行construct()!"
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2373,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 "镜像没有找到。"
 
@@ -2397,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 ""
 
@@ -2410,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 "这个请求受到频率限制。"
 
@@ -2457,9 +2508,9 @@ msgstr "主机 %(host)s 没有找到。"
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 "无法找到实例"
 
@@ -2592,143 +2643,147 @@ msgstr "无法找到请求的镜像"
 msgid "Invalid key_name provided."
 msgstr "提供了无效的key_name。"
 
+#: 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:1081
+#: nova/api/openstack/compute/plugins/v3/servers.py:1078
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "id不能是None"
 
 #: nova/api/openstack/compute/servers.py:1003
-#: nova/api/openstack/compute/plugins/v3/servers.py:1085
+#: nova/api/openstack/compute/plugins/v3/servers.py:1082
 #, fuzzy
 msgid "Personality cannot be updated."
 msgstr "id不能是None"
 
 #: nova/api/openstack/compute/servers.py:1029
 #: nova/api/openstack/compute/servers.py:1046
-#: nova/api/openstack/compute/plugins/v3/servers.py:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1065
-#: nova/api/openstack/compute/plugins/v3/servers.py:1147
+#: 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:1069
-#: nova/api/openstack/compute/plugins/v3/servers.py:1151
+#: nova/api/openstack/compute/plugins/v3/servers.py:1148
 msgid "Missing argument 'type' for reboot"
 msgstr "缺少重启的参数'type'"
 
 #: nova/api/openstack/compute/servers.py:1091
-#: nova/api/openstack/compute/plugins/v3/servers.py:1173
+#: 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:1176
+#: nova/api/openstack/compute/plugins/v3/servers.py:1173
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "调整大小需要尺寸的改变。"
 
 #: nova/api/openstack/compute/servers.py:1100
-#: nova/api/openstack/compute/plugins/v3/servers.py:1182
+#: 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:1186
+#: 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:1108
-#: nova/api/openstack/compute/plugins/v3/servers.py:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "%s 是一个正确的实例名称"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: nova/api/openstack/compute/plugins/v3/servers.py:1208
 msgid "Missing imageRef attribute"
 msgstr "缺少属性imageRef"
 
 #: nova/api/openstack/compute/servers.py:1138
-#: nova/api/openstack/compute/plugins/v3/servers.py:1220
+#: nova/api/openstack/compute/plugins/v3/servers.py:1217
 msgid "Invalid imageRef provided."
 msgstr "提供了无效的imageRef。"
 
 #: nova/api/openstack/compute/servers.py:1165
-#: nova/api/openstack/compute/plugins/v3/servers.py:1253
+#: nova/api/openstack/compute/plugins/v3/servers.py:1250
 msgid "Missing flavorRef attribute"
 msgstr "缺少属性flavorRef"
 
 #: nova/api/openstack/compute/servers.py:1178
-#: nova/api/openstack/compute/plugins/v3/servers.py:1266
+#: nova/api/openstack/compute/plugins/v3/servers.py:1263
 msgid "No adminPass was specified"
 msgstr "没有确定adminPass"
 
 #: nova/api/openstack/compute/servers.py:1182
 #: nova/api/openstack/compute/servers.py:1391
-#: nova/api/openstack/compute/plugins/v3/servers.py:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1188
-#: nova/api/openstack/compute/plugins/v3/servers.py:1276
+#: nova/api/openstack/compute/plugins/v3/servers.py:1273
 #, fuzzy
 msgid "Unable to set password on instance"
 msgstr "重新启动实例失败"
 
 #: nova/api/openstack/compute/servers.py:1197
-#: nova/api/openstack/compute/plugins/v3/servers.py:1285
+#: 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:1298
+#: nova/api/openstack/compute/plugins/v3/servers.py:1295
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "调整大小请求中的属性'flavorRef'无效。"
 
 #: nova/api/openstack/compute/servers.py:1213
-#: nova/api/openstack/compute/plugins/v3/servers.py:1301
+#: nova/api/openstack/compute/plugins/v3/servers.py:1298
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "调整大小请求要求有属性'flavorRef'。"
 
 #: nova/api/openstack/compute/servers.py:1231
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: nova/api/openstack/compute/plugins/v3/servers.py:1322
 msgid "Could not parse imageRef from request."
 msgstr "无法解析请求中的imageRef。"
 
 #: nova/api/openstack/compute/servers.py:1298
-#: nova/api/openstack/compute/plugins/v3/servers.py:1386
+#: 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:1420
+#: nova/api/openstack/compute/plugins/v3/servers.py:1417
 msgid "createImage entity requires name attribute"
 msgstr "实体createImage需要属性name"
 
 #: nova/api/openstack/compute/servers.py:1417
-#: nova/api/openstack/compute/plugins/v3/servers.py:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
@@ -2769,6 +2824,7 @@ msgstr "Compute.api::reset_network %s"
 #: 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 "没有找到服务器"
 
@@ -2809,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 "没有找到实例"
 
@@ -2936,7 +2993,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 "只有根证书能被获取。"
 
@@ -2978,34 +3036,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp不在运行中"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "无效的快照"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, fuzzy, python-format
 msgid "Coverage doesn't have %s action"
 msgstr "网络不包含动作 %s"
@@ -3016,42 +3074,49 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s 必须是'MANUAL' 或者 'AUTO'。"
 
 #: 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
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host与block_migration必须确定"
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "迁移错误 %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/contrib/fixed_ips.py:73
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 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 "没有请求主体"
@@ -3087,7 +3152,7 @@ msgstr "浮动ip %(address)s 没有被关联。"
 
 #: 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr "缺少参数 dict"
 
@@ -3140,7 +3205,7 @@ msgid "Floating ip %(address)s is not associated with instance %(id)s."
 msgstr "浮动ip %(address)s 没有被关联。"
 
 #: nova/api/openstack/compute/contrib/floating_ips_bulk.py:146
-#: nova/cmd/manage.py:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3338,30 +3403,36 @@ 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 "
@@ -3373,7 +3444,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr "错误格式的 scheduler_hints 属性"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "参数不够创建有效规则。"
 
@@ -3392,16 +3463,16 @@ msgstr "显示id是 %s 的网络"
 msgid "security group default rule not found"
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "错误的to_global_ipv6前缀：%s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "没有指定安全组"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "安全组名称不能是空"
 
@@ -3427,7 +3498,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 #, fuzzy
 msgid "Unknown service"
 msgstr "未知的guestmount错误"
@@ -3487,12 +3558,17 @@ msgstr "加载的扩展：%s"
 msgid "Ext version: %i"
 msgstr "Ext 描述: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "释放地址 %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "释放地址 %s"
@@ -3511,107 +3587,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: nova/api/openstack/compute/plugins/v3/servers.py:1031
 #, fuzzy, python-format
 msgid "Running _create_extension_point for %s"
 msgstr "调用扩展工厂 %s"
 
-#: nova/api/openstack/compute/views/servers.py:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3622,42 +3711,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3669,7 +3758,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3702,35 +3791,84 @@ msgstr "启动VPN %s"
 msgid "Failed to load %s"
 msgstr "无法创建卷"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "元素不是子节点"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3753,326 +3891,326 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 #, fuzzy
 msgid "Reserved"
 msgstr "已接收 %s"
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: nova/cmd/manage.py:290 nova/cmd/manage.py:365 nova/cmd/manage.py:690
+#: nova/cmd/manage.py:703
 #, fuzzy, python-format
 msgid "error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/cmd/manage.py:299
+#: nova/cmd/manage.py:298
 #, fuzzy
 msgid "network"
 msgstr "重置网络"
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 #, fuzzy
 msgid "IP address"
 msgstr "起始地址"
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 #, fuzzy
 msgid "No fixed IP found."
 msgstr "找不到固定IP。"
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, fuzzy, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr "没有固定ip与实例关联"
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 #, fuzzy
 msgid "No floating IP addresses have been defined."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr "id"
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr "IPv4"
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr "IPv6"
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr "起始地址"
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr "DNS1"
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr "DNS2"
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr "VlanID"
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr "项目"
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 #, fuzzy
 msgid "No networks found"
 msgstr "没有找到网络"
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 #, fuzzy
 msgid "UUID is required to delete Quantum Networks"
 msgstr "创建网络 %(req)s  是必要的。"
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 #, fuzzy
 msgid "instance"
 msgstr "停止实例 %r"
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, fuzzy, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 #, fuzzy
 msgid "An unexpected error has occurred."
 msgstr "意外错误：%s"
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 #, fuzzy
 msgid "PROJECT"
 msgstr "项目"
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 #, fuzzy
 msgid "Must supply valid parameters to create instance_type"
 msgstr "无法创建实例类型。"
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 #, fuzzy
 msgid "Instance Type exists."
 msgstr "实例 - %s 不存在"
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 #, fuzzy
 msgid "Unknown error"
 msgstr "未知的guestmount错误"
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, fuzzy, python-format
 msgid "%s created"
 msgstr "表 |%s| 没有创建"
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 #, fuzzy
 msgid "Valid instance type name is required"
 msgstr "%s 是一个正确的实例名称"
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, fuzzy, python-format
 msgid "DB Error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, fuzzy, python-format
 msgid "Hypervisor: %s"
 msgstr "类型is = %s"
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -4086,256 +4224,256 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "超过实例的配额。您无法运行更多此类型的实例。"
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "超过实例的配额。您只能再运行 %s 个此类型的实例。"
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr "%(pid)s 已经超过配额，试图设置 %(num_metadata)s 个元数据属性"
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 #, fuzzy
 msgid "Metadata property key greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 #, fuzzy
 msgid "Metadata property value greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "无法附加卷到实例 %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备运行 %s 个实例"
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1252
+#: 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:1258
+#: nova/compute/api.py:1264
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "准备尝试软删除实例 %s"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "准备尝试停止实例 %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "准备尝试启动实例 %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。假定在迁移。"
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: 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:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既不是字符串也不是unicode"
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s 不能为空。"
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: 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:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "无法销毁VBD %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "无法销毁VBD %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "安全组id应该是整数"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "添加安全组规则：%r"
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授权 %s 安全组入口权限"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入口权限"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr "安全组id应该是整数"
 
@@ -4400,13 +4538,13 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than or equal to 0"
-msgstr "createBackup的属性 'rotation'必须是整数"
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
 
 #: nova/compute/flavors.py:119
 #, fuzzy
@@ -4427,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "重新启动实例失败"
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute重启后，实例正在重启。"
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "意外的状态码"
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr "正在检查状态"
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr "正在启动虚拟机"
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:1175
-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:1177
+#: nova/compute/manager.py:1180
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
 #: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "正在重新创建实例 %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: 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:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "为卷 %s 创建快照"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "正在重启虚拟机 %s"
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "实例 %s：重启"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: 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:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮换出%d个备份"
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜像 %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 #, fuzzy
 msgid "Root password set"
 msgstr "实例 %s：Root密码已设置"
 
-#: nova/compute/manager.py:2028
+#: 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:2043
+#: nova/compute/manager.py:2092
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 #, fuzzy
 msgid "error setting admin password"
 msgstr "设置管理员密码出错"
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 #, fuzzy
 msgid "Unrescuing"
 msgstr "实例 %s：取消救援"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状态"
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "实例没有卷。"
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr "目标与来源一样。"
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 #, fuzzy
 msgid "Pausing"
 msgstr "正在更新。"
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "实例 %s ：获取诊断"
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 #, fuzzy
 msgid "Reset network"
 msgstr "重置网络"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 #, fuzzy
 msgid "Inject network info"
 msgstr "实例 %s：注入网络信息"
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 #, fuzzy
 msgid "Get console output"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "实例 %s：正在获得VNC控制台"
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 #, fuzzy
 msgid "Getting spice console"
 msgstr "实例 %s：正在获得VNC控制台"
 
-#: nova/compute/manager.py:3003
+#: 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:3054
+#: 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:3064
+#: 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:3080
+#: 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:3111
+#: 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:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "从未知实例%s中分离卷"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "实例 %s 的网络分配"
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "post_live_migration()已经启动。"
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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."
@@ -4946,171 +5104,171 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。”这个错误可以放心的忽略。"
 
-#: nova/compute/manager.py:3476
+#: nova/compute/manager.py:3525
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "迁移后操作启动"
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "为ip： %s获取元数据失败"
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: 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:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 #, fuzzy
 msgid "In ERROR state"
 msgstr "节点处于未知的错误状态。"
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr "更新主机状态"
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "实例未启动"
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状态"
@@ -5212,11 +5370,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr "未指定计算宿主机"
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "无法找到实例 %s 的宿主机"
@@ -5232,16 +5390,35 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:322
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, fuzzy, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr "无法迁移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
+
+#: 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 "正在添加控制台"
@@ -5323,7 +5500,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "重新启动实例失败"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5346,44 +5523,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "无法识别的 read_deleted 取值”%s“"
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, fuzzy, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, fuzzy, python-format
 msgid "Invalid floating IP %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, fuzzy, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, fuzzy, python-format
 msgid "Invalid instance id %s in request"
 msgstr "实例 %s：已救援"
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5481,47 +5658,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr "正在从glance镜像服务器中下载镜像 %s"
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "把 %(image_location)s 下载到 %(image_path)s失败"
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "解密 %(image_location)s 到 %(image_path)s失败"
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "解包 %(image_location)s 到 %(image_path)s 失败"
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "上传 %(image_location)s 到 %(image_path)s 失败"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "解密初始化vector失败：%s"
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "解密镜像文件 %(image_file)s 失败：%(err)s"
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr "镜像中不安全的文件名"
 
@@ -5729,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"
@@ -5931,156 +6108,156 @@ 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 子网"
 
-#: nova/network/quantumv2/__init__.py:67
-#, fuzzy
-msgid "quantum authentication failed"
-msgstr "认证错误"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
+msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, fuzzy, python-format
 msgid "allocate_for_instance() for %s"
 msgstr "实例 %s 的网络分配"
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, fuzzy, python-format
 msgid "empty project id for instance %s"
 msgstr "实例 %s 的网络分配"
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 #, fuzzy
 msgid "Port not found"
 msgstr "没有找到主机"
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, fuzzy, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr "在数据库删除卷失败"
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, fuzzy, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr "在数据库删除卷失败"
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, fuzzy, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr "实例的network_info：|%s|"
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, fuzzy, python-format
 msgid "validate_networks() for %s"
 msgstr "错误的网络格式"
 
-#: nova/network/quantumv2/api.py:690
+#: nova/network/quantumv2/api.py:688
 #, fuzzy, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "找不到适合id %(id)s 的浮动IP。"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "抓到错误：%s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "安全组id应该是整数"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "抓到错误：%s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: 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:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr "没有找到安全组 %(security_group_id)s 针对项目 %(project_id)s 。"
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6102,12 +6279,12 @@ msgstr "设置管理员密码出错"
 msgid "Invalid version string"
 msgstr "不正确的server_string：%s"
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6313,11 +6490,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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
+#, fuzzy, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr "未知的基文件：%s"
+
 #: nova/openstack/common/db/sqlalchemy/session.py:462
 msgid "DB exception wrapped."
 msgstr "数据库异常被包裹。"
@@ -6367,11 +6554,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, fuzzy, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6809,86 +6991,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "正确的服务在运行吗？"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "无法找到另一个计算节点"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "设置实例 %(instance_uuid)s 至 ERROR 状态"
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, fuzzy, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr "无法迁移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "尝试创建 %(num_instances)d 个实例"
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "请求：%s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "过滤掉的主机 %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "过滤掉的主机 %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "无法迁移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
@@ -6923,36 +7098,36 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr "接收到 %(service_name)s 服务更新，来自 %(host)s。"
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, fuzzy, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr "接收到 %(service_name)s 服务更新，来自 %(host)s。"
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "计算节点 %s 没有服务"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
-#, 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'"
 msgstr "无法统计调度器的选项文件 %(filename)s：“%(e)s”"
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "无法解码调度器的选项：“%(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
@@ -6975,7 +7150,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6993,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 ""
@@ -7044,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"
@@ -7236,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 ""
@@ -7244,53 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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 "正在运行的实例：%s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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 "终止实例之后：%s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制杀死实例后：%s"
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 #, fuzzy
 msgid "spawn error"
 msgstr "未知的guestmount错误"
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7416,19 +7611,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代理"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代理文件"
@@ -7438,25 +7633,25 @@ msgstr "移除在 %s 的模拟的客户代理文件"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "无法加载虚拟驱动：%s"
@@ -7466,7 +7661,7 @@ msgstr "无法加载虚拟驱动：%s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "试图不过滤没有过滤的实例"
 
@@ -7489,20 +7684,20 @@ msgstr "添加安全组规则：%r"
 msgid "Adding provider rule: %s"
 msgstr "添加提供者规则：%s"
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info'解析失败"
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr "fmt=%(fmt)s 由 %(backing_file)s 支持"
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "转化为裸格式，但目前格式是 %s"
@@ -7521,37 +7716,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "获取实例列表"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7602,85 +7797,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "为实例 |%s| 分配浮动IP"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "正在从glance镜像服务器中下载镜像 %s"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "将 %(injection)s 注入到镜像 %(img_id)s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "实例 %s 的网络分配"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "实例 %s 的网络分配"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: nova/virt/baremetal/pxe.py:480
 #, fuzzy, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr "等待RPC响应返回超时"
 
-#: nova/virt/baremetal/tilera.py:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "实例 %s 的网络分配"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr "节点处于未知的错误状态。"
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "无法找到实例 %s 的宿主机"
@@ -7768,24 +7963,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, fuzzy, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr "无法确定iscsi initiator名字"
@@ -7795,7 +7990,7 @@ msgstr "无法确定iscsi initiator名字"
 msgid "No fixed PXE IP is associated to %s"
 msgstr "没有固定ip与实例关联"
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7809,23 +8004,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "没有更多的浮动ip。"
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "未找到分区"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "虚拟接口创建失败"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "未找到分区"
@@ -7938,12 +8128,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8200,12 +8390,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "更新代理失败：%(resp)r"
@@ -8234,23 +8424,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "获取实例 %s 控制台输出"
@@ -8264,7 +8454,7 @@ msgstr "实例代理版本：%s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "正在更新主机状态"
@@ -8630,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:1924
+#: 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:1931
+#: 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'"
@@ -8801,7 +8991,7 @@ msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "正在创建虚拟机实例快照 %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator名字"
 
@@ -8840,248 +9030,248 @@ msgstr "无法为VDI %s 找到VBD"
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "卷组 %s 不存在"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "销毁时发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr "实例销毁成功。"
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "准备停止实例"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
-msgstr "删除实例文件 %(target)s"
+msgid "Deleting instance files %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "没有网络定义。"
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "没有网络定义。"
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "重新启动实例失败"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr "实例在运行"
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: 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:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr "正在创建镜像"
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: 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:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9089,77 +9279,92 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(不支持getVersion)"
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9167,37 +9372,37 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3174
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9206,7 +9411,7 @@ msgstr ""
 "无法迁移%(instance_id)s 到 %(dest)s 上：缺少磁盘(主机:%(available)s <= "
 "实例:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9215,7 +9420,7 @@ msgstr ""
 "已启动实例的CPU信息：\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9230,74 +9435,79 @@ msgstr ""
 "\n"
 "参考 %(u)s"
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "预在线迁移在%(dest)s失败"
+#: nova/virt/libvirt/driver.py:3353
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
-msgstr "因它像卷，所以跳过 %(path)s"
+msgid "skipping %s since it looks like volume"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: 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:3721
+#: nova/virt/libvirt/driver.py:3788
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "实例 %s 成功运行。"
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3915
-#, fuzzy, python-format
-msgid "Checking instance files accessability%(instance_path)s"
-msgstr "删除实例文件 %(target)s"
+#: nova/virt/libvirt/driver.py:3982
+#, python-format
+msgid "Checking instance files accessability %s"
+msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
 msgid ""
@@ -9315,15 +9525,15 @@ msgstr "正在确保静态过滤器"
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr "nwfilter(%(instance_filter_name)s)未找到"
+msgid "The nwfilter(%s) is not found."
+msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "名称为 %(name)s 的nwfilter(%(instance_filter_name)s) 未找到。"
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables 防火墙：设置基本的过滤规则"
 
@@ -9518,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: 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:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "保证桥 %s"
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9567,7 +9778,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9575,7 +9786,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9583,7 +9794,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9799,7 +10010,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9947,32 +10158,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr "针对useconnection_type=vmwareapi必须指定vmwareapi_host_ip,vmwareapi_host_username和vmwareapi_host_password"
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "没有找到标记 [%s]"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "在vmwareapi：_create_session，得到这个异常：%s"
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "在vmwareapi：_call_method，得到这个异常：%s"
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状态：成功"
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状态：错误 %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "在vmwareapi：_poll_task，得到这个错误 %s"
@@ -9987,34 +10198,34 @@ msgstr "调用 RetrieveProperties 时发生错误 %s"
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, fuzzy, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "属性 %(attr)s 没有为管理对象 %(objName)s 设置"
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr "没有虚拟机注册"
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "ref 为 %s 的虚拟机不存在"
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "退出无效的会话或者已经退出了：%s"
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr "会话有错误"
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "会话无效"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " 还没有虚拟机被注册"
@@ -10247,12 +10458,12 @@ msgstr "正在冷启动虚拟机 %s"
 msgid "Did hard reboot of VM"
 msgstr "已经冷启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "重启xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "已经注销虚拟机 %s"
@@ -10373,103 +10584,103 @@ msgstr "正在关闭虚拟机 %s"
 msgid "Powered on the VM"
 msgstr "关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "正在删除volumeID：%s "
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "实例 - %s 不存在"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr "注销虚拟机时在 vmwareapi:vmops:destroy 中发生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "正在删除volumeID：%s "
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "从快照 %s 创建卷"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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 "找到%(instance_count)d个超过%(timeout)d秒悬挂的重启"
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "自动冷重启 %d"
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics 没有在 vmwareapi 里实现"
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 #, fuzzy
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr "正在重新配置虚拟机实例 %s 来附加镜像磁盘"
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 #, fuzzy
 msgid "Reconfigured VM instance to set the machine id"
 msgstr "已经重新配置虚拟机实例 %s 来附加于镜像磁盘"
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, fuzzy, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr "正在重新配置实例 %(name)s 来设置机器的id为ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, fuzzy, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr "已经重新配置虚拟机实例 %(name)s 来设置机器的id为ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "正在使用路径 %s 创建目录"
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr "已经创建路径为 %s 的目录"
@@ -10592,106 +10803,87 @@ msgstr "没有在数据库找到卷"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr "超时：调用 %(method)s 超时。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr "没有执行：代理不支持 %(method)s 的调用。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "对 %(method)s 的调用返回错误：%(e)s。"
 
-#: nova/virt/xenapi/agent.py:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr "查询代理版本"
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "把代理更新为 %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "设置管理员密码"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr "重置网络"
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr "该镜像有XenServer工具，但是不能进行网络注入"
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr "没有在该镜像上安装XenServer工具"
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
@@ -10710,54 +10902,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr "不支持在XenServer启动主机"
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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 "产生 NotImplemented 错误"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake 没有 %s 的实现"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11024,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 "
@@ -11254,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 ""
 
@@ -11629,32 +11821,32 @@ msgstr "未知的基文件：%s"
 msgid "Error in handshake: %s"
 msgstr "握手出错：%s"
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr "无效的请求：%s"
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr "请求：%s"
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr "请求缺少令牌：%s"
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr "请求中有无效令牌：%s"
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr "意外错误：%s"
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "启动nova-xvpvncproxy节点(版本 %s)"
@@ -11674,9 +11866,18 @@ msgstr "状态必须可用"
 msgid "status must be 'available'"
 msgstr "状态必须可用"
 
-#~ msgid "Cannot reboot instance: %s"
+#~ msgid "Cannot disassociate auto assigined floating ip"
 #~ msgstr ""
 
-#~ msgid "No Volume Connector found."
+#~ 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 1c9a4c81d..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-17 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) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1219
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, python-format
 msgid "Unable to find cert_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, python-format
 msgid "Unable to find key_file : %s"
 msgstr ""
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2139,89 +2165,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2269,6 +2313,7 @@ msgstr ""
 #: 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 ""
 
@@ -2315,21 +2360,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2337,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 ""
 
@@ -2361,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 ""
 
@@ -2374,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 ""
 
@@ -2420,9 +2471,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2551,136 +2602,140 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: 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:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2721,6 +2776,7 @@ msgstr ""
 #: 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 ""
 
@@ -2760,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 ""
 
@@ -2881,7 +2938,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2921,32 +2979,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,40 +3015,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3024,7 +3089,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3072,7 +3137,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3263,30 +3328,36 @@ 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 "
@@ -3298,7 +3369,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3348,7 +3419,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3407,12 +3478,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3431,106 +3507,119 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: nova/cells/messaging.py:829
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:873
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3541,42 +3630,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3588,7 +3677,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3621,35 +3710,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3670,312 +3808,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3989,244 +4127,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4290,12 +4428,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: nova/compute/manager.py:3129
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3129
+#: nova/compute/manager.py:3178
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5066,11 +5224,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5086,15 +5244,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5173,7 +5350,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5195,44 +5372,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5328,47 +5505,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5574,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 ""
@@ -5770,151 +5947,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,12 +6113,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6143,11 +6321,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6197,11 +6385,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6626,86 +6809,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: 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:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6740,35 +6916,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6792,7 +6968,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6810,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 ""
@@ -6861,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"
@@ -7052,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7224,19 +7420,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7246,25 +7442,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7273,7 +7469,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7295,20 +7491,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7327,37 +7523,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7405,85 +7601,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: 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:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: 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:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7568,24 +7764,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7595,7 +7791,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7609,22 +7805,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: 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:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7737,12 +7929,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -7995,12 +8187,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8029,23 +8221,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8058,7 +8250,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8410,12 +8602,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8573,7 +8765,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8612,236 +8804,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8849,76 +9041,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2927
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8926,50 +9133,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8979,69 +9186,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9060,15 +9272,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9259,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9307,7 +9520,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9315,7 +9528,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9323,7 +9536,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9534,7 +9747,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9680,32 +9893,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9720,34 +9933,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9959,11 +10172,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10068,100 +10281,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10282,106 +10495,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10397,54 +10591,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10704,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 "
@@ -10933,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 ""
 
@@ -11288,32 +11482,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11331,9 +11525,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ 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 72ee1c068..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-17 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"
@@ -79,299 +79,299 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "發生一個未知例外"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "內文解碼失敗"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "內文解碼失敗"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "建立虛擬介面失敗"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "連續嘗試 5 次建立唯一網路位置(MAC)的虛擬介面失敗"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "未被授權"
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "使用者並沒有管理者權力"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "不可接受的參數值"
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: 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:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "無效的Keypair"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1341
+#: 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:1429
+#: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: 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:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: 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:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "無法卸載 Volume %s"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: 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:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: 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:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,917 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: 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:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: 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:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
-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:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
-#, python-format
-msgid "Certificate %(certificate_id)s not found."
-msgstr ""
-
-#: nova/exception.py:681
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:747
+#: 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:752
+#: 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:757
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: 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:790
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:798
+#: 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:803
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:829
+#: 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:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: 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:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: 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:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: 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 ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: 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:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: 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:1131
+#: nova/exception.py:1137
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1146
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: 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:1150
+#: nova/exception.py:1156
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1160
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: 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:1164
+#: nova/exception.py:1170
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1174
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1179
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1183
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1187
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1191
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1196
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1201
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1206
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1211
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: 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:1213
+#: 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:1218
+#: nova/exception.py:1224
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1229
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1235
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1239
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1243
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1247
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: 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:1249
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1272
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1277
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1282
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1390,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1442,120 +1463,130 @@ 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 "Link Local address is not found.:%s"
+msgid "Couldn't get IPv4 : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:336
+#: nova/utils.py:379
 #, python-format
-msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
+msgid "IPv4 address is not found.: %s"
 msgstr ""
 
-#: nova/utils.py:375
+#: nova/utils.py:382
 #, python-format
-msgid "Invalid backend: %s"
+msgid "Couldn't get IPv4 of %(interface)s : %(ex)s"
 msgstr ""
 
-#: nova/utils.py:436
+#: nova/utils.py:397
 #, python-format
-msgid "Unknown byte multiplier: %s"
+msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:553
+#: 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:582
+#: nova/utils.py:618
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:724
+#: nova/utils.py:760
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:778 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:900 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:1060
+#: nova/utils.py:1103
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: nova/utils.py:1064
+#: nova/utils.py:1107
 #, python-format
 msgid "%(name)s has less than %(min_length)s characters."
 msgstr ""
 
-#: nova/utils.py:1069
+#: nova/utils.py:1112
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
 
-#: nova/wsgi.py:122
+#: nova/wsgi.py:125
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:137
+#: nova/wsgi.py:140
 #, fuzzy, python-format
 msgid "Unable to find cert_file : %s"
 msgstr "找不到Volume %s"
 
-#: nova/wsgi.py:141
+#: nova/wsgi.py:144
 #, fuzzy, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "找不到Volume %s"
 
-#: nova/wsgi.py:145
+#: nova/wsgi.py:148
 #, fuzzy, python-format
 msgid "Unable to find key_file : %s"
 msgstr "找不到Volume %s"
 
-#: nova/wsgi.py:149
+#: 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:180
+#: nova/wsgi.py:183
 #, python-format
 msgid "Failed to start %(name)s on %(host)s:%(port)s with SSL support"
 msgstr ""
 
-#: nova/wsgi.py:207
+#: nova/wsgi.py:210
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:225
+#: nova/wsgi.py:228
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:294
+#: nova/wsgi.py:297
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:480
+#: nova/wsgi.py:483
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1569,7 +1600,7 @@ 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:62
+#: nova/api/metadata/password.py:61
 msgid "Request is too large."
 msgstr ""
 
@@ -1715,261 +1746,256 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: 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:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: 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:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: 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:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:843
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847 nova/api/openstack/compute/contrib/volumes.py:242
+#: 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:874
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:887
+#: 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:898
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:445
+#: 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:927
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:953 nova/api/ec2/cloud.py:1010
-#: nova/api/ec2/cloud.py:1576 nova/api/ec2/cloud.py:1591
+#: 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:1085
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1245
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1249
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1253
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1258
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1261
+#: 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:1271
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1279
+#: 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:1288
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1291
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1294
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1302
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1307
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1310
-#: nova/api/openstack/compute/contrib/floating_ips.py:97
-msgid "Cannot disassociate auto assigned floating ip"
-msgstr ""
-
-#: nova/api/ec2/cloud.py:1337
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1375
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1385
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1395
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1405
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1496
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1512
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1531
+#: 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:1594
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1600
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1641
+#: 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:1673
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1691
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
+#: 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:1719 nova/api/ec2/cloud.py:1764
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1726 nova/api/ec2/cloud.py:1771
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1783
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1856
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2140,89 +2166,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: 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:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: 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:236
+#: 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:237
+#: 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:239
+#: 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:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: 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:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: 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 ""
@@ -2270,6 +2314,7 @@ msgstr ""
 #: 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 ""
 
@@ -2316,21 +2361,24 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 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 ""
@@ -2338,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 ""
 
@@ -2362,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 ""
 
@@ -2375,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 ""
 
@@ -2421,9 +2472,9 @@ msgstr ""
 #: 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:1093
-#: nova/api/openstack/compute/plugins/v3/servers.py:1201
-#: nova/api/openstack/compute/plugins/v3/servers.py:1380
+#: 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 ""
 
@@ -2552,137 +2603,141 @@ msgstr ""
 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:1081
+#: 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:1085
+#: 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:1111
-#: nova/api/openstack/compute/plugins/v3/servers.py:1128
+#: 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:1131
+#: 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:1147
+#: 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:1151
+#: 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:1173
+#: 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:1176
+#: 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:1182
+#: 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:1186
+#: 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:1190
+#: nova/api/openstack/compute/plugins/v3/servers.py:1187
 #, fuzzy
 msgid "Invalid instance image."
 msgstr "無效的快照(snapshot)"
 
 #: nova/api/openstack/compute/servers.py:1129
-#: nova/api/openstack/compute/plugins/v3/servers.py:1211
+#: 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:1220
+#: 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:1253
+#: 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:1266
+#: 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:1270
-#: nova/api/openstack/compute/plugins/v3/servers.py:1479
+#: 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:1276
+#: 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:1285
+#: 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:1298
+#: 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:1301
+#: 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:284
+#: 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:79
-#: nova/api/openstack/compute/plugins/v3/servers.py:1319
+#: 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:1325
+#: 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:1386
+#: 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:1420
+#: 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:1501
+#: nova/api/openstack/compute/plugins/v3/servers.py:1498
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2723,6 +2778,7 @@ msgstr ""
 #: 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 ""
 
@@ -2762,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 ""
 
@@ -2884,7 +2941,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: 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 ""
 
@@ -2925,33 +2983,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "無效的快照(snapshot)"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: 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:203
+#: 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:216
+#: 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:274
+#: 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:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2962,40 +3020,47 @@ 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:43
+#: 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:74
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: 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 ""
 
@@ -3029,7 +3094,7 @@ 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:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3077,7 +3142,7 @@ 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:386
+#: nova/cmd/manage.py:385
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
@@ -3268,30 +3333,36 @@ 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 "
@@ -3303,7 +3374,7 @@ 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:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3320,16 +3391,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: 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:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3353,7 +3424,7 @@ msgstr ""
 msgid "Missing disabled reason field"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/services.py:189
+#: nova/api/openstack/compute/contrib/services.py:188
 msgid "Unknown service"
 msgstr ""
 
@@ -3412,12 +3483,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: 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:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3436,107 +3512,120 @@ msgstr ""
 msgid "Did not find any server create extensions"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/servers.py:1034
+#: 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:186
+#: nova/api/openstack/compute/views/servers.py:176
 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:823
+#: 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:866
+#: nova/cells/messaging.py:873
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:888
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:902
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: 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:1101
+#: 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:1121
+#: 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"
@@ -3547,42 +3636,42 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: 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:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: 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:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
 
-#: nova/cells/state.py:271
+#: nova/cells/state.py:272
 msgid "Updating cell cache from db."
 msgstr ""
 
-#: nova/cells/state.py:316
+#: nova/cells/state.py:317
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capabilities"
 msgstr ""
 
-#: nova/cells/state.py:332
+#: nova/cells/state.py:333
 #, python-format
 msgid "Unknown cell '%(cell_name)s' when trying to update capacities"
 msgstr ""
@@ -3594,7 +3683,7 @@ msgid ""
 "hint"
 msgstr ""
 
-#: nova/cells/weights/mute_child.py:69
+#: 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 "
@@ -3627,35 +3716,84 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "找不到Volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: 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:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
 
-#: nova/cmd/baremetal_manage.py:158 nova/cmd/manage.py:1258
+#: 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:1262
+#: 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:1264
+#: 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:1309
+#: nova/cmd/baremetal_manage.py:204 nova/cmd/manage.py:1306
 msgid "Command failed, please check log for more info"
 msgstr ""
 
@@ -3676,312 +3814,312 @@ msgstr ""
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: nova/cmd/manage.py:207
+#: 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:242
+#: 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:248
+#: nova/cmd/manage.py:247
 msgid "Quota"
 msgstr ""
 
-#: nova/cmd/manage.py:249
+#: nova/cmd/manage.py:248
 msgid "Limit"
 msgstr ""
 
-#: nova/cmd/manage.py:250
+#: nova/cmd/manage.py:249
 msgid "In Use"
 msgstr ""
 
-#: nova/cmd/manage.py:251
+#: nova/cmd/manage.py:250
 msgid "Reserved"
 msgstr ""
 
-#: nova/cmd/manage.py:291 nova/cmd/manage.py:366 nova/cmd/manage.py:692
-#: nova/cmd/manage.py:705
+#: 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:299
+#: nova/cmd/manage.py:298
 msgid "network"
 msgstr ""
 
-#: nova/cmd/manage.py:300
+#: nova/cmd/manage.py:299
 msgid "IP address"
 msgstr ""
 
-#: nova/cmd/manage.py:301
+#: nova/cmd/manage.py:300
 msgid "hostname"
 msgstr ""
 
-#: nova/cmd/manage.py:302 nova/cmd/manage.py:826
+#: nova/cmd/manage.py:301 nova/cmd/manage.py:824
 msgid "host"
 msgstr ""
 
-#: nova/cmd/manage.py:314 nova/cmd/manage.py:338
+#: nova/cmd/manage.py:313 nova/cmd/manage.py:337
 msgid "No fixed IP found."
 msgstr ""
 
-#: nova/cmd/manage.py:330
+#: nova/cmd/manage.py:329
 #, python-format
 msgid "WARNING: fixed ip %s allocated to missing instance"
 msgstr ""
 
-#: nova/cmd/manage.py:393
+#: 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:444
+#: nova/cmd/manage.py:443
 msgid "No floating IP addresses have been defined."
 msgstr ""
 
-#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:212
+#: nova/cmd/manage.py:505 nova/tests/test_nova_manage.py:212
 msgid "id"
 msgstr ""
 
-#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:213
+#: nova/cmd/manage.py:506 nova/tests/test_nova_manage.py:213
 msgid "IPv4"
 msgstr ""
 
-#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:214
+#: nova/cmd/manage.py:507 nova/tests/test_nova_manage.py:214
 msgid "IPv6"
 msgstr ""
 
-#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:215
+#: nova/cmd/manage.py:508 nova/tests/test_nova_manage.py:215
 msgid "start address"
 msgstr ""
 
-#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:216
+#: nova/cmd/manage.py:509 nova/tests/test_nova_manage.py:216
 msgid "DNS1"
 msgstr ""
 
-#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:217
+#: nova/cmd/manage.py:510 nova/tests/test_nova_manage.py:217
 msgid "DNS2"
 msgstr ""
 
-#: nova/cmd/manage.py:512 nova/tests/test_nova_manage.py:218
+#: nova/cmd/manage.py:511 nova/tests/test_nova_manage.py:218
 msgid "VlanID"
 msgstr ""
 
-#: nova/cmd/manage.py:513 nova/cmd/manage.py:619
+#: nova/cmd/manage.py:512 nova/cmd/manage.py:618
 #: nova/tests/test_nova_manage.py:219
 msgid "project"
 msgstr ""
 
-#: nova/cmd/manage.py:514 nova/tests/test_nova_manage.py:220
+#: nova/cmd/manage.py:513 nova/tests/test_nova_manage.py:220
 msgid "uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:521
+#: nova/cmd/manage.py:520
 msgid "No networks found"
 msgstr ""
 
-#: nova/cmd/manage.py:540
+#: nova/cmd/manage.py:539
 msgid "Please specify either fixed_range or uuid"
 msgstr ""
 
-#: nova/cmd/manage.py:545
+#: nova/cmd/manage.py:544
 msgid "UUID is required to delete Quantum Networks"
 msgstr ""
 
-#: nova/cmd/manage.py:548
+#: nova/cmd/manage.py:547
 msgid "Deleting by fixed_range is not supported with the QuantumManager"
 msgstr ""
 
-#: nova/cmd/manage.py:611
+#: nova/cmd/manage.py:610
 msgid "instance"
 msgstr ""
 
-#: nova/cmd/manage.py:612
+#: nova/cmd/manage.py:611
 msgid "node"
 msgstr ""
 
-#: nova/cmd/manage.py:613
+#: nova/cmd/manage.py:612
 msgid "type"
 msgstr ""
 
-#: nova/cmd/manage.py:614
+#: nova/cmd/manage.py:613
 msgid "state"
 msgstr ""
 
-#: nova/cmd/manage.py:615
+#: nova/cmd/manage.py:614
 msgid "launched"
 msgstr ""
 
-#: nova/cmd/manage.py:616
+#: nova/cmd/manage.py:615
 msgid "image"
 msgstr ""
 
-#: nova/cmd/manage.py:617
+#: nova/cmd/manage.py:616
 msgid "kernel"
 msgstr ""
 
-#: nova/cmd/manage.py:618
+#: nova/cmd/manage.py:617
 msgid "ramdisk"
 msgstr ""
 
-#: nova/cmd/manage.py:620
+#: nova/cmd/manage.py:619
 msgid "user"
 msgstr ""
 
-#: nova/cmd/manage.py:621 nova/cmd/manage.py:827
+#: nova/cmd/manage.py:620 nova/cmd/manage.py:825
 msgid "zone"
 msgstr ""
 
-#: nova/cmd/manage.py:622
+#: nova/cmd/manage.py:621
 msgid "index"
 msgstr ""
 
-#: nova/cmd/manage.py:667
+#: nova/cmd/manage.py:665
 msgid "Binary"
 msgstr ""
 
-#: nova/cmd/manage.py:668
+#: nova/cmd/manage.py:666
 msgid "Host"
 msgstr ""
 
-#: nova/cmd/manage.py:669
+#: nova/cmd/manage.py:667
 msgid "Zone"
 msgstr ""
 
-#: nova/cmd/manage.py:670
+#: nova/cmd/manage.py:668
 msgid "Status"
 msgstr ""
 
-#: nova/cmd/manage.py:671
+#: nova/cmd/manage.py:669
 msgid "State"
 msgstr ""
 
-#: nova/cmd/manage.py:672
+#: nova/cmd/manage.py:670
 msgid "Updated_At"
 msgstr ""
 
-#: nova/cmd/manage.py:694
+#: nova/cmd/manage.py:692
 #, python-format
 msgid "Service %(service)s on host %(host)s enabled."
 msgstr ""
 
-#: nova/cmd/manage.py:707
+#: nova/cmd/manage.py:705
 #, python-format
 msgid "Service %(service)s on host %(host)s disabled."
 msgstr ""
 
-#: nova/cmd/manage.py:774
+#: nova/cmd/manage.py:772
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: nova/cmd/manage.py:775
+#: nova/cmd/manage.py:773
 msgid "[Result]"
 msgstr ""
 
-#: nova/cmd/manage.py:779
+#: nova/cmd/manage.py:777
 msgid "HOST"
 msgstr ""
 
-#: nova/cmd/manage.py:780
+#: nova/cmd/manage.py:778
 msgid "PROJECT"
 msgstr ""
 
-#: nova/cmd/manage.py:781
+#: nova/cmd/manage.py:779
 msgid "cpu"
 msgstr ""
 
-#: nova/cmd/manage.py:782
+#: nova/cmd/manage.py:780
 msgid "mem(mb)"
 msgstr ""
 
-#: nova/cmd/manage.py:783
+#: nova/cmd/manage.py:781
 msgid "hdd"
 msgstr ""
 
-#: nova/cmd/manage.py:866
+#: nova/cmd/manage.py:864
 msgid "Must supply a positive value for max_rows"
 msgstr ""
 
-#: nova/cmd/manage.py:905
+#: nova/cmd/manage.py:903
 msgid "Must supply valid parameters to create instance_type"
 msgstr ""
 
-#: nova/cmd/manage.py:909
+#: nova/cmd/manage.py:907
 msgid "Instance Type exists."
 msgstr ""
 
-#: nova/cmd/manage.py:910
+#: nova/cmd/manage.py:908
 msgid "Please ensure instance_type name and flavorid are unique."
 msgstr ""
 
-#: nova/cmd/manage.py:912
+#: nova/cmd/manage.py:910
 msgid "Currently defined instance_type names and flavorids:"
 msgstr ""
 
-#: nova/cmd/manage.py:917
+#: nova/cmd/manage.py:915
 msgid "Unknown error"
 msgstr ""
 
-#: nova/cmd/manage.py:920
+#: nova/cmd/manage.py:918
 #, python-format
 msgid "%s created"
 msgstr ""
 
-#: nova/cmd/manage.py:928
+#: nova/cmd/manage.py:926
 msgid "Valid instance type name is required"
 msgstr ""
 
-#: nova/cmd/manage.py:931
+#: nova/cmd/manage.py:929
 #, python-format
 msgid "DB Error: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:936
+#: nova/cmd/manage.py:934
 #, python-format
 msgid "%s deleted"
 msgstr ""
 
-#: nova/cmd/manage.py:972
+#: 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:994
+#: nova/cmd/manage.py:992
 #, python-format
 msgid "Key %(key)s on instance type %(name)s unset"
 msgstr ""
 
-#: nova/cmd/manage.py:1040
+#: nova/cmd/manage.py:1037
 #, python-format
 msgid "Hypervisor: %s"
 msgstr ""
 
-#: nova/cmd/manage.py:1081
+#: nova/cmd/manage.py:1078
 #, python-format
 msgid "Line %(linenum)d : %(line)s"
 msgstr ""
 
-#: nova/cmd/manage.py:1083
+#: nova/cmd/manage.py:1080
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: nova/cmd/manage.py:1095
+#: nova/cmd/manage.py:1092
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: nova/cmd/manage.py:1099
+#: nova/cmd/manage.py:1096
 #, python-format
 msgid "Last %s nova syslog entries:-"
 msgstr ""
 
-#: nova/cmd/manage.py:1108
+#: nova/cmd/manage.py:1105
 msgid "No nova entries in syslog!"
 msgstr ""
 
@@ -3995,246 +4133,246 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: 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:329
+#: 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:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:571
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:667
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:812
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:839
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1122
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "建立虛擬介面失敗"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1258
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1264
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1274
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1318
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1343
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1394
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1410
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1482
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1719
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2057
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: 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:2103
+#: nova/compute/api.py:2114
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2253
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2358
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2366
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2438
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2552
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2574
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: 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:2814 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:2818 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:2900
+#: nova/compute/api.py:2912
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: 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:2917
+#: nova/compute/api.py:2929
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2947
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2950
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2957
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2976
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "找不到Volume %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3036
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "找不到Volume %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3041
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3049
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3052
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3129 nova/compute/api.py:3203
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3145
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3148
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3157
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3210
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4298,12 +4436,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4324,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:379
+#: nova/compute/manager.py:383
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: 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:456
+#: 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:472
+#: nova/compute/manager.py:476
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: 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:499
+#: nova/compute/manager.py:503
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: 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:567
+#: nova/compute/manager.py:571
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:574
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: 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:587
+#: nova/compute/manager.py:591
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:605
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:610
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:620
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:624
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:640
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: 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:686
+#: nova/compute/manager.py:694
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: 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:801
+#: nova/compute/manager.py:809
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:910
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:933
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2465
+#: nova/compute/manager.py:960 nova/compute/manager.py:2514
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:1004
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1013
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1044
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1061
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2518
+#: nova/compute/manager.py:1086 nova/compute/manager.py:2567
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1099
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1104
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1110
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1139
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1149
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1163
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
-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:1177
+#: 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:1207
+#: nova/compute/manager.py:1244
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1295
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1369
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1376
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1419
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1422
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1429
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1477
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2700
-#: nova/compute/manager.py:4223
+#: 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:1654
+#: nova/compute/manager.py:1703
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1716
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1720
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1724
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1807
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1839
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "無法卸載 Volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1857
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: 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:1863
+#: nova/compute/manager.py:1912
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1928
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1955
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: 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:1973
+#: nova/compute/manager.py:2022
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2030
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2035
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2070
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2077
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2092
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2099
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: 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:2068
+#: nova/compute/manager.py:2117
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: 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:2101
+#: nova/compute/manager.py:2150
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2169
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2173
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2191
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2434
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2418
+#: nova/compute/manager.py:2468
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2424
+#: nova/compute/manager.py:2474
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2446
+#: nova/compute/manager.py:2495
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2697
+#: nova/compute/manager.py:2746
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2760
+#: nova/compute/manager.py:2809
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2778
+#: nova/compute/manager.py:2827
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2817
+#: nova/compute/manager.py:2866
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2897
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2868
+#: nova/compute/manager.py:2917
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2922
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2876
+#: nova/compute/manager.py:2925
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2942
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2920
+#: nova/compute/manager.py:2969
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2955
+#: nova/compute/manager.py:3004
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3003
+#: nova/compute/manager.py:3052
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3054
+#: nova/compute/manager.py:3103
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3064
+#: 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:3080
+#: 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:3111
+#: nova/compute/manager.py:3160
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3171
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:3129
+#: 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:3153
+#: nova/compute/manager.py:3202
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3189
+#: nova/compute/manager.py:3238
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3209
+#: nova/compute/manager.py:3258
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3223
+#: nova/compute/manager.py:3272
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3376
+#: nova/compute/manager.py:3425
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3404
+#: nova/compute/manager.py:3453
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3459
+#: nova/compute/manager.py:3508
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3461
+#: 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:3476
+#: nova/compute/manager.py:3525
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3508
+#: nova/compute/manager.py:3557
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3637
+#: nova/compute/manager.py:3686
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3687
+#: 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:3692
+#: nova/compute/manager.py:3743
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3701
+#: nova/compute/manager.py:3752
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3709
+#: nova/compute/manager.py:3760
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3714
+#: nova/compute/manager.py:3765
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3721
+#: nova/compute/manager.py:3772
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3732
+#: nova/compute/manager.py:3783
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3748
+#: 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:3768
+#: nova/compute/manager.py:3819
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3792
+#: nova/compute/manager.py:3843
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3895
+#: nova/compute/manager.py:3946
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3909
+#: nova/compute/manager.py:3960
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3936
+#: 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:3943 nova/compute/manager.py:3992
+#: 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:3979
+#: 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:4016
+#: nova/compute/manager.py:4067
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4028 nova/compute/manager.py:4037
-#: nova/compute/manager.py:4067
+#: 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:4032
+#: nova/compute/manager.py:4083
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4048
+#: nova/compute/manager.py:4099
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4054
+#: nova/compute/manager.py:4105
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4060
+#: nova/compute/manager.py:4111
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4076
+#: nova/compute/manager.py:4127
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4084
+#: nova/compute/manager.py:4135
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4097
+#: nova/compute/manager.py:4148
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4124
+#: nova/compute/manager.py:4175
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4134 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:4174
+#: 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:4180
+#: 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:4187
+#: nova/compute/manager.py:4238
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4214
+#: nova/compute/manager.py:4265
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5077,11 +5235,11 @@ msgstr ""
 msgid "Missing keys: %s"
 msgstr ""
 
-#: nova/compute/rpcapi.py:53
+#: nova/compute/rpcapi.py:58
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/rpcapi.py:56
+#: nova/compute/rpcapi.py:61
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
@@ -5097,15 +5255,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:116
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: 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 ""
@@ -5184,7 +5361,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5206,44 +5383,44 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:662
+#: nova/db/sqlalchemy/api.py:649
 #, python-format
 msgid "Invalid floating ip id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:883
+#: nova/db/sqlalchemy/api.py:870
 #, python-format
 msgid "Invalid floating IP %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1168 nova/db/sqlalchemy/api.py:1208
+#: 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:1345
+#: nova/db/sqlalchemy/api.py:1332
 #, python-format
 msgid "Invalid virtual interface address %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1438
+#: 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:1573
+#: nova/db/sqlalchemy/api.py:1560
 #, python-format
 msgid "Invalid instance id %s in request"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2927
+#: 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:4458
+#: nova/db/sqlalchemy/api.py:4451
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5339,47 +5516,47 @@ msgstr ""
 msgid "fetching image %s from glance"
 msgstr ""
 
-#: nova/image/s3.py:335
+#: nova/image/s3.py:332
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:352
+#: nova/image/s3.py:349
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:363
+#: nova/image/s3.py:360
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:373
+#: nova/image/s3.py:370
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:382
 #, python-format
 msgid "Image %s was deleted underneath us"
 msgstr ""
 
-#: nova/image/s3.py:400
+#: nova/image/s3.py:397
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:407
+#: nova/image/s3.py:404
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:418
+#: nova/image/s3.py:415
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:430
+#: nova/image/s3.py:427
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -5585,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 ""
@@ -5782,151 +5959,152 @@ 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 ""
 
-#: nova/network/quantumv2/__init__.py:67
-msgid "quantum authentication failed"
+#: nova/network/quantumv2/__init__.py:45
+#, python-format
+msgid "Quantum client authentication failed: %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:154
+#: nova/network/quantumv2/api.py:152
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:157
+#: nova/network/quantumv2/api.py:155
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: 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:272
+#: nova/network/quantumv2/api.py:270
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:280
+#: 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:320
+#: nova/network/quantumv2/api.py:318
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:329
+#: nova/network/quantumv2/api.py:327
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:351
+#: nova/network/quantumv2/api.py:349
 #, python-format
 msgid "Failed to delete quantum port %(port_id)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:375
+#: nova/network/quantumv2/api.py:373
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:407
+#: 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:437
+#: 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:447
+#: nova/network/quantumv2/api.py:445
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:690
+#: 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:53
+#: 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:71
+#: 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:124
+#: 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:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: 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:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: 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:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: 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:249
+#: 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:260
+#: 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:374
+#: 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:384
-#: nova/network/security_group/quantum_driver.py:434
+#: 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:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5947,12 +6125,12 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: nova/objects/base.py:201
+#: nova/objects/base.py:202
 #, python-format
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:303
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6155,11 +6333,21 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: nova/openstack/common/strutils.py:72
+#: 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 ""
@@ -6209,11 +6397,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6640,86 +6823,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/utils.py:70
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: 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:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: 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:288
+#: 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:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6754,35 +6930,35 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: 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:403
+#: 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:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/scheduler_options.py:71
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:71
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/utils.py:54
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to %(service)s_%(method)s: %(ex)s"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6806,7 +6982,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -6824,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 ""
@@ -6875,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"
@@ -7066,59 +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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: 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:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: 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:1814
+#: nova/tests/compute/test_compute.py:1949
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4271
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4782
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9400
+#: nova/tests/compute/test_compute.py:9713
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1772
+#: nova/tests/db/test_migrations.py:1805
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7238,19 +7434,19 @@ 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 "
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: 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:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7260,25 +7456,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7287,7 +7483,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7309,20 +7505,20 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:113
+#: nova/virt/images.py:114
 msgid "Snapshot list encountered but no header found!"
 msgstr ""
 
-#: nova/virt/images.py:202
+#: nova/virt/images.py:203
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:208
+#: nova/virt/images.py:209
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:220
+#: nova/virt/images.py:221
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -7341,37 +7537,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: 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:284
+#: 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:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: 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:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7424,85 +7620,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: 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:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: 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:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: 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:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: 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:482
+#: 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:145
+#: 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:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7587,24 +7783,24 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
-#: nova/virt/baremetal/virtual_power_driver.py:111
+#: 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:115
+#: 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:121
+#: 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:122
+#: 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:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7614,7 +7810,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7628,22 +7824,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: 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:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "建立虛擬介面失敗"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7756,12 +7948,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: 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:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8014,12 +8206,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "找不到Volume %s"
@@ -8048,23 +8240,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8077,7 +8269,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:4008
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8429,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:1924
+#: 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:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1944
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8593,7 +8785,7 @@ msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8632,237 +8824,237 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:567
+#: 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:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: 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:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "連接到glance失敗"
 
-#: nova/virt/libvirt/driver.py:781
+#: 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:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: 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:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: 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:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1394
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1402
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1451
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1597
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 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:1608
+#: nova/virt/libvirt/driver.py:1620
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: 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:1660 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:1729
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: 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:1738 nova/virt/libvirt/driver.py:1743
+#: 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:1814
+#: nova/virt/libvirt/driver.py:1827
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1928
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1981
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: 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:2033
+#: 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:2039
+#: 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:2043
+#: 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:2047
+#: nova/virt/libvirt/driver.py:2067
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: 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:2387
+#: nova/virt/libvirt/driver.py:2407
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8870,76 +9062,91 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2424
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: 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:2440
+#: 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:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: 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:2622 nova/virt/libvirt/driver.py:2626
+#: 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:2635
+#: nova/virt/libvirt/driver.py:2679
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2686
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2691
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: 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:2674
+#: nova/virt/libvirt/driver.py:2718
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: 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:2798
+#: nova/virt/libvirt/driver.py:2842
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: 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:2896
+#: nova/virt/libvirt/driver.py:2940
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8947,50 +9154,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: 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:2919
+#: 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:2996
+#: 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:3077
+#: nova/virt/libvirt/driver.py:3122
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3130
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: 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:3155
+#: nova/virt/libvirt/driver.py:3202
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3214
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9000,69 +9207,74 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: 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:3234
+#: nova/virt/libvirt/driver.py:3281
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3353
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: 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:3520
+#: 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:3537
+#: nova/virt/libvirt/driver.py:3600
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3604
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: 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:3653
+#: nova/virt/libvirt/driver.py:3719
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3788
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3794
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3859
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3982
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9081,15 +9293,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: 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:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9280,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:386
-#: nova/virt/libvirt/vif.py:473
+#: 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:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: 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:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: 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:304
+#: nova/virt/libvirt/vif.py:338
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:348
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: 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:502
+#: 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:529
+#: 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 "
@@ -9328,7 +9541,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: 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 "
@@ -9336,7 +9549,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: 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 "
@@ -9344,7 +9557,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: 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 "
@@ -9557,7 +9770,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9704,32 +9917,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: 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:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9744,34 +9957,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: 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:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: 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:559
+#: 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:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9983,11 +10196,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: 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:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10092,100 +10305,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: 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:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "找不到Volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: 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:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: 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:1159
+#: 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:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10308,106 +10521,87 @@ msgstr "無法卸載 Volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 從虛擬機器 %(instance_name)s 卸載"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: 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:106 nova/virt/xenapi/vmops.py:1645
+#: 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:111 nova/virt/xenapi/vmops.py:1650
+#: 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:123
+#: 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:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: 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:321
+#: 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:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10423,54 +10617,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: 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:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -10730,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 "
@@ -10959,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 ""
 
@@ -11315,32 +11509,32 @@ msgstr ""
 msgid "Error in handshake: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:116
+#: nova/vnc/xvp_proxy.py:115
 #, python-format
 msgid "Invalid request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:136
+#: nova/vnc/xvp_proxy.py:135
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:139
+#: nova/vnc/xvp_proxy.py:138
 #, python-format
 msgid "Request made with missing token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:149
+#: nova/vnc/xvp_proxy.py:148
 #, python-format
 msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:156
+#: nova/vnc/xvp_proxy.py:155
 #, python-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: nova/vnc/xvp_proxy.py:176
+#: nova/vnc/xvp_proxy.py:175
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
@@ -11358,9 +11552,18 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Cannot reboot instance: %s"
+#~ 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 "No Volume Connector found."
+#~ msgid "Failed to schedule_%(method)s: %(ex)s"
 #~ msgstr ""